Deprecate old relations completely (#12482)

# What

Fully deprecate old relations because we have one bug tied to it and it
make the codebase complex

# How I've made this PR:
1. remove metadata datasource (we only keep 'core') => this was causing
extra complexity in the refactor + flaky reset
2. merge dev and demo datasets => as I needed to update the tests which
is very painful, I don't want to do it twice
3. remove all code tied to RELATION_METADATA /
relation-metadata.resolver, or anything tied to the old relation system
4. Remove ONE_TO_ONE and MANY_TO_MANY that are not supported
5. fix impacts on the different areas : see functional testing below 

# Functional testing

## Functional testing from the front-end:
1. Database Reset ✅
2. Sign In ✅
3. Workspace sign-up ✅
5. Browsing table / kanban / show ✅
6. Assigning a record in a one to many / in a many to one ✅
7. Deleting a record involved in a relation ✅ => broken but not tied to
this PR
8. "Add new" from relation picker ✅ => broken but not tied to this PR
9. Creating a Task / Note, Updating a Task / Note relations, Deleting a
Task / Note (from table, show page, right drawer) ✅ => broken but not
tied to this PR
10. creating a relation from settings (custom / standard x oneToMany /
manyToOne) ✅
11. updating a relation from settings should not be possible ✅
12. deleting a relation from settings (custom / standard x oneToMany /
manyToOne) ✅
13. Make sure timeline activity still work (relation were involved
there), espacially with Task / Note => to be double checked ✅ => Cannot
convert undefined or null to object
14. Workspace deletion / User deletion ✅ 
15. CSV Import should keep working ✅ 
16. Permissions: I have tested without permissions V2 as it's still hard
to test v2 work and it's not in prod yet ✅
17. Workflows global test ✅ 

## From the API:
1. Review open-api documentation (REST) ✅ 
2. Make sure REST Api are still able to fetch relations ==> won't do, we
have a coupling Get/Update/Create there, this requires refactoring
3. Make sure REST Api is still able to update / remove relation => won't
do same

## Automated tests
1. lint + typescript ✅
2. front unit tests: ✅
3. server unit tests 2 ✅
4. front stories: ✅
5. server integration: ✅
6. chromatic check : expected 0
7. e2e check : expected no more that current failures

## Remove // Todos
1. All are captured by functional tests above, nothing additional to do

## (Un)related regressions
1. Table loading state is not working anymore, we see the empty state
before table content
2. Filtering by Creator Tim Ap return empty results
3. Not possible to add Tasks / Notes / Files from show page

# Result

## New seeds that can be easily extended
<img width="1920" alt="image"
src="https://github.com/user-attachments/assets/d290d130-2a5f-44e6-b419-7e42a89eec4b"
/>

## -5k lines of code
## No more 'metadata' dataSource (we only have 'core)
## No more relationMetadata (I haven't drop the table yet it's not
referenced in the code anymore)
## We are ready to fix the 6 months lag between current API results and
our mocked tests
## No more bug on relation creation / deletion

---------

Co-authored-by: Weiko <corentin@twenty.com>
Co-authored-by: Félix Malfait <felix@twenty.com>

.cursor/rules/README.md

@@ -52,7 +52,7 @@ npx nx run twenty-server:test              # Run unit tests
 npx nx run twenty-server:test:integration:with-db-reset # Run integration tests
 
 # Migrations
-npx nx run twenty-server:typeorm migration:generate src/database/typeorm/metadata/migrations/[name] -d src/database/typeorm/metadata/metadata.datasource.ts
+npx nx run twenty-server:typeorm migration:generate src/database/typeorm/core/migrations/[name] -d src/database/typeorm/core/core.datasource.ts
 
 # Workspace
 npx nx run twenty-server:command workspace:sync-metadata -f  # Sync metadata

.github/workflows/ci-server.yaml

@@ -89,19 +89,15 @@ jobs:
           fi
       - name: Server / Check for Pending Migrations
         run: |
-          METADATA_MIGRATION_OUTPUT=$(npx nx run twenty-server:typeorm migration:generate metadata-migration-check -d src/database/typeorm/metadata/metadata.datasource.ts || true)
-
           CORE_MIGRATION_OUTPUT=$(npx nx run twenty-server:typeorm migration:generate core-migration-check -d src/database/typeorm/core/core.datasource.ts || true)
 
-          METADATA_MIGRATION_FILE=$(ls packages/twenty-server/*metadata-migration-check.ts 2>/dev/null || echo "")
           CORE_MIGRATION_FILE=$(ls packages/twenty-server/*core-migration-check.ts 2>/dev/null || echo "")
 
-          if [ -n "$METADATA_MIGRATION_FILE" ] || [ -n "$CORE_MIGRATION_FILE" ]; then
+          if [ -n "$CORE_MIGRATION_FILE" ]; then
             echo "::error::Unexpected migration files were generated. Please create a proper migration manually."
-            echo "$METADATA_MIGRATION_OUTPUT"
             echo "$CORE_MIGRATION_OUTPUT"
 
-            rm -f packages/twenty-server/*metadata-migration-check.ts packages/twenty-server/*core-migration-check.ts
+            rm -f packages/twenty-server/*core-migration-check.ts
             
             exit 1
           fi

packages/twenty-chrome-extension/src/generated/graphql.tsx

@@ -6358,7 +6358,7 @@ export type RelationConnection = {
 };
 
 export type RelationDefinition = {
-  direction: RelationDefinitionType;
+  direction: RelationType;
   relationId: Scalars['UUID'];
   sourceFieldMetadata: Field;
   sourceObjectMetadata: Object;
@@ -6367,7 +6367,7 @@ export type RelationDefinition = {
 };
 
 /** Relation definition type */
-export enum RelationDefinitionType {
+export enum RelationType {
   ManyToMany = 'MANY_TO_MANY',
   ManyToOne = 'MANY_TO_ONE',
   OneToMany = 'ONE_TO_MANY',

packages/twenty-front/jest.config.ts

@@ -56,7 +56,7 @@ const jestConfig: JestConfigWithTsJest = {
     global: {
       statements: 57,
       lines: 55,
-      functions: 47,
+      functions: 46,
     },
   },
   collectCoverageFrom: ['<rootDir>/src/**/*.ts'],

packages/twenty-front/src/generated-metadata/gql.ts

@@ -26,13 +26,11 @@ const documents = {
     "\n  \n  query GetOneDatabaseConnection($input: RemoteServerIdInput!) {\n    findOneRemoteServerById(input: $input) {\n      ...RemoteServerFields\n    }\n  }\n": types.GetOneDatabaseConnectionDocument,
     "\n  mutation CreateOneObjectMetadataItem($input: CreateOneObjectInput!) {\n    createOneObject(input: $input) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      isSearchable\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n      isLabelSyncedWithName\n    }\n  }\n": types.CreateOneObjectMetadataItemDocument,
     "\n  mutation CreateOneFieldMetadataItem($input: CreateOneFieldMetadataInput!) {\n    createOneField(input: $input) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n      settings\n      defaultValue\n      options\n      isLabelSyncedWithName\n    }\n  }\n": types.CreateOneFieldMetadataItemDocument,
-    "\n  mutation CreateOneRelationMetadataItem(\n    $input: CreateOneRelationMetadataInput!\n  ) {\n    createOneRelationMetadata(input: $input) {\n      id\n      relationType\n      fromObjectMetadataId\n      toObjectMetadataId\n      fromFieldMetadataId\n      toFieldMetadataId\n      createdAt\n      updatedAt\n    }\n  }\n": types.CreateOneRelationMetadataItemDocument,
     "\n  mutation UpdateOneFieldMetadataItem(\n    $idToUpdate: UUID!\n    $updatePayload: UpdateFieldInput!\n  ) {\n    updateOneField(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n      settings\n      isLabelSyncedWithName\n    }\n  }\n": types.UpdateOneFieldMetadataItemDocument,
     "\n  mutation UpdateOneObjectMetadataItem(\n    $idToUpdate: UUID!\n    $updatePayload: UpdateObjectPayload!\n  ) {\n    updateOneObject(input: { id: $idToUpdate, update: $updatePayload }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      isSearchable\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n      isLabelSyncedWithName\n    }\n  }\n": types.UpdateOneObjectMetadataItemDocument,
     "\n  mutation DeleteOneObjectMetadataItem($idToDelete: UUID!) {\n    deleteOneObject(input: { id: $idToDelete }) {\n      id\n      dataSourceId\n      nameSingular\n      namePlural\n      labelSingular\n      labelPlural\n      description\n      icon\n      isCustom\n      isActive\n      isSearchable\n      createdAt\n      updatedAt\n      labelIdentifierFieldMetadataId\n      imageIdentifierFieldMetadataId\n      isLabelSyncedWithName\n    }\n  }\n": types.DeleteOneObjectMetadataItemDocument,
     "\n  mutation DeleteOneFieldMetadataItem($idToDelete: UUID!) {\n    deleteOneField(input: { id: $idToDelete }) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n      settings\n    }\n  }\n": types.DeleteOneFieldMetadataItemDocument,
-    "\n  mutation DeleteOneRelationMetadataItem($idToDelete: UUID!) {\n    deleteOneRelation(input: { id: $idToDelete }) {\n      id\n    }\n  }\n": types.DeleteOneRelationMetadataItemDocument,
+    "\n  query ObjectMetadataItems {\n    objects(paging: { first: 1000 }) {\n      edges {\n        node {\n          id\n          dataSourceId\n          nameSingular\n          namePlural\n          labelSingular\n          labelPlural\n          description\n          icon\n          isCustom\n          isRemote\n          isActive\n          isSystem\n          createdAt\n          updatedAt\n          labelIdentifierFieldMetadataId\n          imageIdentifierFieldMetadataId\n          shortcut\n          isLabelSyncedWithName\n          isSearchable\n          duplicateCriteria\n          indexMetadatas(paging: { first: 100 }) {\n            edges {\n              node {\n                id\n                createdAt\n                updatedAt\n                name\n                indexWhereClause\n                indexType\n                isUnique\n                indexFieldMetadatas(paging: { first: 100 }) {\n                  edges {\n                    node {\n                      id\n                      createdAt\n                      updatedAt\n                      order\n                      fieldMetadataId\n                    }\n                  }\n                }\n              }\n            }\n          }\n          fieldsList {\n            id\n            type\n            name\n            label\n            description\n            icon\n            isCustom\n            isActive\n            isSystem\n            isNullable\n            isUnique\n            createdAt\n            updatedAt\n            defaultValue\n            options\n            settings\n            isLabelSyncedWithName\n            relation {\n              type\n              sourceObjectMetadata {\n                id\n                nameSingular\n                namePlural\n              }\n              targetObjectMetadata {\n                id\n                nameSingular\n                namePlural\n              }\n              sourceFieldMetadata {\n                id\n                name\n              }\n              targetFieldMetadata {\n                id\n                name\n              }\n            }\n          }\n        }\n      }\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n    }\n  }\n": types.ObjectMetadataItemsDocument,
-    "\n  query ObjectMetadataItems {\n    objects(paging: { first: 1000 }) {\n      edges {\n        node {\n          id\n          dataSourceId\n          nameSingular\n          namePlural\n          labelSingular\n          labelPlural\n          description\n          icon\n          isCustom\n          isRemote\n          isActive\n          isSystem\n          createdAt\n          updatedAt\n          labelIdentifierFieldMetadataId\n          imageIdentifierFieldMetadataId\n          shortcut\n          isLabelSyncedWithName\n          isSearchable\n          duplicateCriteria\n          indexMetadatas(paging: { first: 100 }) {\n            edges {\n              node {\n                id\n                createdAt\n                updatedAt\n                name\n                indexWhereClause\n                indexType\n                isUnique\n                indexFieldMetadatas(paging: { first: 100 }) {\n                  edges {\n                    node {\n                      id\n                      createdAt\n                      updatedAt\n                      order\n                      fieldMetadataId\n                    }\n                  }\n                }\n              }\n            }\n          }\n          fieldsList {\n            id\n            type\n            name\n            label\n            description\n            icon\n            isCustom\n            isActive\n            isSystem\n            isNullable\n            isUnique\n            createdAt\n            updatedAt\n            defaultValue\n            options\n            settings\n            isLabelSyncedWithName\n            relationDefinition {\n              relationId\n              direction\n              sourceObjectMetadata {\n                id\n                nameSingular\n                namePlural\n              }\n              sourceFieldMetadata {\n                id\n                name\n              }\n              targetObjectMetadata {\n                id\n                nameSingular\n                namePlural\n              }\n              targetFieldMetadata {\n                id\n                name\n              }\n            }\n          }\n        }\n      }\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n    }\n  }\n": types.ObjectMetadataItemsDocument,
     "\n  fragment ServerlessFunctionFields on ServerlessFunction {\n    id\n    name\n    description\n    runtime\n    timeoutSeconds\n    latestVersion\n    latestVersionInputSchema\n    publishedVersions\n    createdAt\n    updatedAt\n  }\n": types.ServerlessFunctionFieldsFragmentDoc,
     "\n  \n  mutation CreateOneServerlessFunctionItem(\n    $input: CreateServerlessFunctionInput!\n  ) {\n    createOneServerlessFunction(input: $input) {\n      ...ServerlessFunctionFields\n    }\n  }\n": types.CreateOneServerlessFunctionItemDocument,
     "\n  \n  mutation DeleteOneServerlessFunction($input: ServerlessFunctionIdInput!) {\n    deleteOneServerlessFunction(input: $input) {\n      ...ServerlessFunctionFields\n    }\n  }\n": types.DeleteOneServerlessFunctionDocument,
@@ -111,10 +109,6 @@ export function graphql(source: "\n  mutation CreateOneObjectMetadataItem($input
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function graphql(source: "\n  mutation CreateOneFieldMetadataItem($input: CreateOneFieldMetadataInput!) {\n    createOneField(input: $input) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n      settings\n      defaultValue\n      options\n      isLabelSyncedWithName\n    }\n  }\n"): (typeof documents)["\n  mutation CreateOneFieldMetadataItem($input: CreateOneFieldMetadataInput!) {\n    createOneField(input: $input) {\n      id\n      type\n      name\n      label\n      description\n      icon\n      isCustom\n      isActive\n      isNullable\n      createdAt\n      updatedAt\n      settings\n      defaultValue\n      options\n      isLabelSyncedWithName\n    }\n  }\n"];
-/**
- * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
- */
-export function graphql(source: "\n  mutation CreateOneRelationMetadataItem(\n    $input: CreateOneRelationMetadataInput!\n  ) {\n    createOneRelationMetadata(input: $input) {\n      id\n      relationType\n      fromObjectMetadataId\n      toObjectMetadataId\n      fromFieldMetadataId\n      toFieldMetadataId\n      createdAt\n      updatedAt\n    }\n  }\n"): (typeof documents)["\n  mutation CreateOneRelationMetadataItem(\n    $input: CreateOneRelationMetadataInput!\n  ) {\n    createOneRelationMetadata(input: $input) {\n      id\n      relationType\n      fromObjectMetadataId\n      toObjectMetadataId\n      fromFieldMetadataId\n      toFieldMetadataId\n      createdAt\n      updatedAt\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -134,11 +128,7 @@ export function graphql(source: "\n  mutation DeleteOneFieldMetadataItem($idToDe
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  mutation DeleteOneRelationMetadataItem($idToDelete: UUID!) {\n    deleteOneRelation(input: { id: $idToDelete }) {\n      id\n    }\n  }\n"): (typeof documents)["\n  mutation DeleteOneRelationMetadataItem($idToDelete: UUID!) {\n    deleteOneRelation(input: { id: $idToDelete }) {\n      id\n    }\n  }\n"];
+export function graphql(source: "\n  query ObjectMetadataItems {\n    objects(paging: { first: 1000 }) {\n      edges {\n        node {\n          id\n          dataSourceId\n          nameSingular\n          namePlural\n          labelSingular\n          labelPlural\n          description\n          icon\n          isCustom\n          isRemote\n          isActive\n          isSystem\n          createdAt\n          updatedAt\n          labelIdentifierFieldMetadataId\n          imageIdentifierFieldMetadataId\n          shortcut\n          isLabelSyncedWithName\n          isSearchable\n          duplicateCriteria\n          indexMetadatas(paging: { first: 100 }) {\n            edges {\n              node {\n                id\n                createdAt\n                updatedAt\n                name\n                indexWhereClause\n                indexType\n                isUnique\n                indexFieldMetadatas(paging: { first: 100 }) {\n                  edges {\n                    node {\n                      id\n                      createdAt\n                      updatedAt\n                      order\n                      fieldMetadataId\n                    }\n                  }\n                }\n              }\n            }\n          }\n          fieldsList {\n            id\n            type\n            name\n            label\n            description\n            icon\n            isCustom\n            isActive\n            isSystem\n            isNullable\n            isUnique\n            createdAt\n            updatedAt\n            defaultValue\n            options\n            settings\n            isLabelSyncedWithName\n            relation {\n              type\n              sourceObjectMetadata {\n                id\n                nameSingular\n                namePlural\n              }\n              targetObjectMetadata {\n                id\n                nameSingular\n                namePlural\n              }\n              sourceFieldMetadata {\n                id\n                name\n              }\n              targetFieldMetadata {\n                id\n                name\n              }\n            }\n          }\n        }\n      }\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n    }\n  }\n"): (typeof documents)["\n  query ObjectMetadataItems {\n    objects(paging: { first: 1000 }) {\n      edges {\n        node {\n          id\n          dataSourceId\n          nameSingular\n          namePlural\n          labelSingular\n          labelPlural\n          description\n          icon\n          isCustom\n          isRemote\n          isActive\n          isSystem\n          createdAt\n          updatedAt\n          labelIdentifierFieldMetadataId\n          imageIdentifierFieldMetadataId\n          shortcut\n          isLabelSyncedWithName\n          isSearchable\n          duplicateCriteria\n          indexMetadatas(paging: { first: 100 }) {\n            edges {\n              node {\n                id\n                createdAt\n                updatedAt\n                name\n                indexWhereClause\n                indexType\n                isUnique\n                indexFieldMetadatas(paging: { first: 100 }) {\n                  edges {\n                    node {\n                      id\n                      createdAt\n                      updatedAt\n                      order\n                      fieldMetadataId\n                    }\n                  }\n                }\n              }\n            }\n          }\n          fieldsList {\n            id\n            type\n            name\n            label\n            description\n            icon\n            isCustom\n            isActive\n            isSystem\n            isNullable\n            isUnique\n            createdAt\n            updatedAt\n            defaultValue\n            options\n            settings\n            isLabelSyncedWithName\n            relation {\n              type\n              sourceObjectMetadata {\n                id\n                nameSingular\n                namePlural\n              }\n              targetObjectMetadata {\n                id\n                nameSingular\n                namePlural\n              }\n              sourceFieldMetadata {\n                id\n                name\n              }\n              targetFieldMetadata {\n                id\n                name\n              }\n            }\n          }\n        }\n      }\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n    }\n  }\n"];
-/**
- * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
- */
-export function graphql(source: "\n  query ObjectMetadataItems {\n    objects(paging: { first: 1000 }) {\n      edges {\n        node {\n          id\n          dataSourceId\n          nameSingular\n          namePlural\n          labelSingular\n          labelPlural\n          description\n          icon\n          isCustom\n          isRemote\n          isActive\n          isSystem\n          createdAt\n          updatedAt\n          labelIdentifierFieldMetadataId\n          imageIdentifierFieldMetadataId\n          shortcut\n          isLabelSyncedWithName\n          isSearchable\n          duplicateCriteria\n          indexMetadatas(paging: { first: 100 }) {\n            edges {\n              node {\n                id\n                createdAt\n                updatedAt\n                name\n                indexWhereClause\n                indexType\n                isUnique\n                indexFieldMetadatas(paging: { first: 100 }) {\n                  edges {\n                    node {\n                      id\n                      createdAt\n                      updatedAt\n                      order\n                      fieldMetadataId\n                    }\n                  }\n                }\n              }\n            }\n          }\n          fieldsList {\n            id\n            type\n            name\n            label\n            description\n            icon\n            isCustom\n            isActive\n            isSystem\n            isNullable\n            isUnique\n            createdAt\n            updatedAt\n            defaultValue\n            options\n            settings\n            isLabelSyncedWithName\n            relationDefinition {\n              relationId\n              direction\n              sourceObjectMetadata {\n                id\n                nameSingular\n                namePlural\n              }\n              sourceFieldMetadata {\n                id\n                name\n              }\n              targetObjectMetadata {\n                id\n                nameSingular\n                namePlural\n              }\n              targetFieldMetadata {\n                id\n                name\n              }\n            }\n          }\n        }\n      }\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n    }\n  }\n"): (typeof documents)["\n  query ObjectMetadataItems {\n    objects(paging: { first: 1000 }) {\n      edges {\n        node {\n          id\n          dataSourceId\n          nameSingular\n          namePlural\n          labelSingular\n          labelPlural\n          description\n          icon\n          isCustom\n          isRemote\n          isActive\n          isSystem\n          createdAt\n          updatedAt\n          labelIdentifierFieldMetadataId\n          imageIdentifierFieldMetadataId\n          shortcut\n          isLabelSyncedWithName\n          isSearchable\n          duplicateCriteria\n          indexMetadatas(paging: { first: 100 }) {\n            edges {\n              node {\n                id\n                createdAt\n                updatedAt\n                name\n                indexWhereClause\n                indexType\n                isUnique\n                indexFieldMetadatas(paging: { first: 100 }) {\n                  edges {\n                    node {\n                      id\n                      createdAt\n                      updatedAt\n                      order\n                      fieldMetadataId\n                    }\n                  }\n                }\n              }\n            }\n          }\n          fieldsList {\n            id\n            type\n            name\n            label\n            description\n            icon\n            isCustom\n            isActive\n            isSystem\n            isNullable\n            isUnique\n            createdAt\n            updatedAt\n            defaultValue\n            options\n            settings\n            isLabelSyncedWithName\n            relationDefinition {\n              relationId\n              direction\n              sourceObjectMetadata {\n                id\n                nameSingular\n                namePlural\n              }\n              sourceFieldMetadata {\n                id\n                name\n              }\n              targetObjectMetadata {\n                id\n                nameSingular\n                namePlural\n              }\n              targetFieldMetadata {\n                id\n                name\n              }\n            }\n          }\n        }\n      }\n      pageInfo {\n        hasNextPage\n        hasPreviousPage\n        startCursor\n        endCursor\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */

packages/twenty-front/src/generated/graphql.tsx

@@ -409,6 +409,7 @@ export type CreateFieldInput = {
   name: Scalars['String'];
   objectMetadataId: Scalars['String'];
   options?: InputMaybe<Scalars['JSON']>;
+  relationCreationPayload?: InputMaybe<Scalars['JSON']>;
   settings?: InputMaybe<Scalars['JSON']>;
   type: FieldMetadataType;
 };
@@ -600,7 +601,6 @@ export type Field = {
   createdAt: Scalars['DateTime'];
   defaultValue?: Maybe<Scalars['JSON']>;
   description?: Maybe<Scalars['String']>;
-  fromRelationMetadata?: Maybe<RelationMetadata>;
   icon?: Maybe<Scalars['String']>;
   id: Scalars['UUID'];
   isActive?: Maybe<Scalars['Boolean']>;
@@ -614,10 +614,8 @@ export type Field = {
   object?: Maybe<Object>;
   options?: Maybe<Scalars['JSON']>;
   relation?: Maybe<Relation>;
-  relationDefinition?: Maybe<RelationDefinition>;
   settings?: Maybe<Scalars['JSON']>;
   standardOverrides?: Maybe<StandardOverrides>;
-  toRelationMetadata?: Maybe<RelationMetadata>;
   type: FieldMetadataType;
   updatedAt: Scalars['DateTime'];
 };
@@ -1688,67 +1686,10 @@ export type Relation = {
   type: RelationType;
 };
 
-export type RelationDefinition = {
-  __typename?: 'RelationDefinition';
-  direction: RelationDefinitionType;
-  relationId: Scalars['UUID'];
-  sourceFieldMetadata: Field;
-  sourceObjectMetadata: Object;
-  targetFieldMetadata: Field;
-  targetObjectMetadata: Object;
-};
-
-/** Relation definition type */
-export enum RelationDefinitionType {
-  MANY_TO_MANY = 'MANY_TO_MANY',
-  MANY_TO_ONE = 'MANY_TO_ONE',
-  ONE_TO_MANY = 'ONE_TO_MANY',
-  ONE_TO_ONE = 'ONE_TO_ONE'
-}
-
-export type RelationMetadata = {
-  __typename?: 'RelationMetadata';
-  createdAt: Scalars['DateTime'];
-  fromFieldMetadataId: Scalars['String'];
-  fromObjectMetadata: Object;
-  fromObjectMetadataId: Scalars['String'];
-  id: Scalars['UUID'];
-  relationType: RelationMetadataType;
-  toFieldMetadataId: Scalars['String'];
-  toObjectMetadata: Object;
-  toObjectMetadataId: Scalars['String'];
-  updatedAt: Scalars['DateTime'];
-};
-
-export type RelationMetadataConnection = {
-  __typename?: 'RelationMetadataConnection';
-  /** Array of edges. */
-  edges: Array<RelationMetadataEdge>;
-  /** Paging information */
-  pageInfo: PageInfo;
-};
-
-export type RelationMetadataEdge = {
-  __typename?: 'RelationMetadataEdge';
-  /** Cursor for this node. */
-  cursor: Scalars['ConnectionCursor'];
-  /** The node containing the RelationMetadata */
-  node: RelationMetadata;
-};
-
-/** Type of the relation */
-export enum RelationMetadataType {
-  MANY_TO_MANY = 'MANY_TO_MANY',
-  MANY_TO_ONE = 'MANY_TO_ONE',
-  ONE_TO_MANY = 'ONE_TO_MANY',
-  ONE_TO_ONE = 'ONE_TO_ONE'
-}
-
 /** Relation type */
 export enum RelationType {
   MANY_TO_ONE = 'MANY_TO_ONE',
-  ONE_TO_MANY = 'ONE_TO_MANY',
+  ONE_TO_MANY = 'ONE_TO_MANY'
-  ONE_TO_ONE = 'ONE_TO_ONE'
 }
 
 export type RemoteServer = {

packages/twenty-front/src/modules/activities/hooks/__tests__/useCreateActivityInDB.test.tsx

@@ -48,6 +48,7 @@ const mocks: MockedResponse[] = [
                   opportunityId
                   personId
                   petId
+                  rocketId
                   surveyResultId
                   taskId
                   type

packages/twenty-front/src/modules/activities/tasks/hooks/__tests__/useCompleteTask.test.tsx

@@ -43,6 +43,7 @@ const mocks: MockedResponse[] = [
                 firstName
                 lastName
               }
+              position
               timeFormat
               timeZone
               updatedAt
@@ -65,6 +66,7 @@ const mocks: MockedResponse[] = [
                   opportunityId
                   personId
                   petId
+                  rocketId
                   surveyResultId
                   taskId
                   type
@@ -73,6 +75,10 @@ const mocks: MockedResponse[] = [
               }
             }
             body
+            bodyV2 {
+              blocknote
+              markdown
+            }
             createdAt
             createdBy {
               source
@@ -97,6 +103,7 @@ const mocks: MockedResponse[] = [
                   personId
                   petId
                   position
+                  rocketId
                   surveyResultId
                   taskId
                   updatedAt
@@ -121,6 +128,7 @@ const mocks: MockedResponse[] = [
                   opportunityId
                   personId
                   petId
+                  rocketId
                   surveyResultId
                   taskId
                   updatedAt
@@ -145,6 +153,7 @@ const mocks: MockedResponse[] = [
                   personId
                   petId
                   properties
+                  rocketId
                   surveyResultId
                   taskId
                   updatedAt

packages/twenty-front/src/modules/apollo/optimistic-effect/utils/triggerUpdateRelationsOptimisticEffect.ts

@@ -9,9 +9,9 @@ import { RecordGqlConnection } from '@/object-record/graphql/types/RecordGqlConn
 import { RecordGqlNode } from '@/object-record/graphql/types/RecordGqlNode';
 import { ApolloCache } from '@apollo/client';
 import { isArray } from '@sniptt/guards';
+import { isDefined } from 'twenty-shared/utils';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
-import { isDefined } from 'twenty-shared/utils';
 
 type triggerUpdateRelationsOptimisticEffectArgs = {
   cache: ApolloCache<unknown>;
@@ -48,14 +48,13 @@ export const triggerUpdateRelationsOptimisticEffect = ({
         return;
       }
 
-      const relationDefinition =
+      const relation = fieldMetadataItemOnSourceRecord.relation;
-        fieldMetadataItemOnSourceRecord.relationDefinition;
 
-      if (!relationDefinition) {
+      if (!relation) {
         return;
       }
 
-      const { targetObjectMetadata, targetFieldMetadata } = relationDefinition;
+      const { targetObjectMetadata, targetFieldMetadata } = relation;
 
       const fullTargetObjectMetadataItem = objectMetadataItems.find(
         ({ nameSingular }) =>
@@ -94,7 +93,7 @@ export const triggerUpdateRelationsOptimisticEffect = ({
           return [];
         }
 
-        if (isObjectRecordConnection(relationDefinition, value)) {
+        if (isObjectRecordConnection(relation, value)) {
           return value.edges.map(({ node }) => node);
         }
 

packages/twenty-front/src/modules/command-menu/pages/message-thread/hooks/__tests__/useEmailThreadInCommandMenu.test.tsx

@@ -123,6 +123,7 @@ const mocks = [
                           firstName
                           lastName
                         }
+                        position
                         timeFormat
                         timeZone
                         updatedAt
@@ -284,6 +285,7 @@ const mocks = [
                     firstName
                     lastName
                   }
+                  position
                   timeFormat
                   timeZone
                   updatedAt

packages/twenty-front/src/modules/favorites/utils/sortFavorites.ts

@@ -69,8 +69,7 @@ export const sortFavorites = (
           const relationObject = favorite[relationField.name];
 
           const objectNameSingular =
-            relationField.relationDefinition?.targetObjectMetadata
+            relationField.relation?.targetObjectMetadata.nameSingular ?? '';
-              .nameSingular ?? '';
 
           const objectRecordIdentifier =
             getObjectRecordIdentifierByNameSingular(

packages/twenty-front/src/modules/object-metadata/graphql/mutations.ts

@@ -45,23 +45,6 @@ export const CREATE_ONE_FIELD_METADATA_ITEM = gql`
   }
 `;
 
-export const CREATE_ONE_RELATION_METADATA_ITEM = gql`
-  mutation CreateOneRelationMetadataItem(
-    $input: CreateOneRelationMetadataInput!
-  ) {
-    createOneRelationMetadata(input: $input) {
-      id
-      relationType
-      fromObjectMetadataId
-      toObjectMetadataId
-      fromFieldMetadataId
-      toFieldMetadataId
-      createdAt
-      updatedAt
-    }
-  }
-`;
-
 export const UPDATE_ONE_FIELD_METADATA_ITEM = gql`
   mutation UpdateOneFieldMetadataItem(
     $idToUpdate: UUID!
@@ -152,11 +135,3 @@ export const DELETE_ONE_FIELD_METADATA_ITEM = gql`
     }
   }
 `;
-
-export const DELETE_ONE_RELATION_METADATA_ITEM = gql`
-  mutation DeleteOneRelationMetadataItem($idToDelete: UUID!) {
-    deleteOneRelation(input: { id: $idToDelete }) {
-      id
-    }
-  }
-`;

packages/twenty-front/src/modules/object-metadata/graphql/queries.ts

@@ -67,23 +67,22 @@ export const FIND_MANY_OBJECT_METADATA_ITEMS = gql`
             options
             settings
             isLabelSyncedWithName
-            relationDefinition {
+            relation {
-              relationId
+              type
-              direction
               sourceObjectMetadata {
                 id
                 nameSingular
                 namePlural
               }
+              targetObjectMetadata {
+                id
+                nameSingular
+                namePlural
+              }
               sourceFieldMetadata {
                 id
                 name
               }
-              targetObjectMetadata {
-                id
-                nameSingular
-                namePlural
-              }
               targetFieldMetadata {
                 id
                 name

packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useCreateOneRelationMetadataItem.ts

@@ -1,47 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const query = gql`
-  mutation CreateOneRelationMetadataItem(
-    $input: CreateOneRelationMetadataInput!
-  ) {
-    createOneRelationMetadata(input: $input) {
-      id
-      relationType
-      fromObjectMetadataId
-      toObjectMetadataId
-      fromFieldMetadataId
-      toFieldMetadataId
-      createdAt
-      updatedAt
-    }
-  }
-`;
-
-export const variables = {
-  input: {
-    relationMetadata: {
-      fromDescription: null,
-      fromIcon: undefined,
-      fromLabel: 'label',
-      fromName: 'name',
-      fromObjectMetadataId: 'objectMetadataId',
-      relationType: 'ONE_TO_ONE',
-      toDescription: null,
-      toIcon: undefined,
-      toLabel: 'Another label',
-      toName: 'anotherName',
-      toObjectMetadataId: 'objectMetadataId1',
-    },
-  },
-};
-
-export const responseData = {
-  id: '',
-  relationType: 'ONE_TO_ONE',
-  fromObjectMetadataId: 'objectMetadataId',
-  toObjectMetadataId: 'objectMetadataId1',
-  fromFieldMetadataId: '',
-  toFieldMetadataId: '',
-  createdAt: '',
-  updatedAt: '',
-};

packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useDeleteOneRelationMetadataItem.ts

@@ -1,15 +0,0 @@
-import { gql } from '@apollo/client';
-
-export const query = gql`
-  mutation DeleteOneRelationMetadataItem($idToDelete: UUID!) {
-    deleteOneRelation(input: { id: $idToDelete }) {
-      id
-    }
-  }
-`;
-
-export const variables = { idToDelete: 'idToDelete' };
-
-export const responseData = {
-  id: 'idToDelete',
-};

packages/twenty-front/src/modules/object-metadata/hooks/__mocks__/useFieldMetadataItem.ts

@@ -4,7 +4,6 @@ import { FieldMetadataType, PermissionsOnAllObjectRecords } from '~/generated/gr
 export const FIELD_METADATA_ID = '2c43466a-fe9e-4005-8d08-c5836067aa6c';
 export const FIELD_RELATION_METADATA_ID =
   '4da0302d-358a-45cd-9973-9f92723ed3c1';
-export const RELATION_METADATA_ID = 'f81d4fae-7dec-11d0-a765-00a0c91e6bf6';
 
 export const queries = {
   deleteMetadataField: gql`
@@ -67,13 +66,6 @@ export const queries = {
       }
     }
   `,
-  deleteMetadataFieldRelation: gql`
-    mutation DeleteOneRelationMetadataItem($idToDelete: UUID!) {
-      deleteOneRelation(input: { id: $idToDelete }) {
-        id
-      }
-    }
-  `,
   activateMetadataField: gql`
     mutation UpdateOneFieldMetadataItem(
       $idToUpdate: UUID!
@@ -216,7 +208,7 @@ export const objectMetadataId = '25611fce-6637-4089-b0ca-91afeec95784';
 
 export const variables = {
   deleteMetadataField: { idToDelete: FIELD_METADATA_ID },
-  deleteMetadataFieldRelation: { idToDelete: RELATION_METADATA_ID },
+  deleteMetadataFieldRelation: { idToDelete: FIELD_RELATION_METADATA_ID },
   activateMetadataField: {
     idToUpdate: FIELD_METADATA_ID,
     updatePayload: { isActive: true },

packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useColumnDefinitionsFromFieldMetadata.test.ts

@@ -69,6 +69,6 @@ describe('useColumnDefinitionsFromFieldMetadata', () => {
 
     const { columnDefinitions } = result.current;
 
-    expect(columnDefinitions.length).toBe(22);
+    expect(columnDefinitions.length).toBe(21);
   });
 });

packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneRelationMetadataItem.test.tsx

@@ -1,77 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { renderHook } from '@testing-library/react';
-import { ReactNode, act } from 'react';
-import { RecoilRoot } from 'recoil';
-
-import { useCreateOneRelationMetadataItem } from '@/object-metadata/hooks/useCreateOneRelationMetadataItem';
-import { RelationDefinitionType } from '~/generated/graphql';
-
-import {
-  query,
-  responseData,
-  variables,
-} from '../__mocks__/useCreateOneRelationMetadataItem';
-
-import {
-  query as findManyObjectMetadataItemsQuery,
-  responseData as findManyObjectMetadataItemsResponseData,
-} from '../__mocks__/useFindManyObjectMetadataItems';
-
-const mocks = [
-  {
-    request: {
-      query,
-      variables,
-    },
-    result: jest.fn(() => ({
-      data: {
-        createOneRelation: responseData,
-      },
-    })),
-  },
-  {
-    request: {
-      query: findManyObjectMetadataItemsQuery,
-      variables: {},
-    },
-    result: jest.fn(() => ({
-      data: findManyObjectMetadataItemsResponseData,
-    })),
-  },
-];
-
-const Wrapper = ({ children }: { children: ReactNode }) => (
-  <RecoilRoot>
-    <MockedProvider mocks={mocks} addTypename={false}>
-      {children}
-    </MockedProvider>
-  </RecoilRoot>
-);
-
-describe('useCreateOneRelationMetadataItem', () => {
-  it('should work as expected', async () => {
-    const { result } = renderHook(() => useCreateOneRelationMetadataItem(), {
-      wrapper: Wrapper,
-    });
-
-    await act(async () => {
-      const res = await result.current.createOneRelationMetadataItem({
-        relationType: RelationDefinitionType.ONE_TO_ONE,
-        field: {
-          label: 'label',
-          name: 'name',
-        },
-        objectMetadataId: 'objectMetadataId',
-        connect: {
-          field: {
-            label: 'Another label',
-            name: 'anotherName',
-          },
-          objectMetadataId: 'objectMetadataId1',
-        },
-      });
-
-      expect(res.data).toEqual({ createOneRelation: responseData });
-    });
-  });
-});

packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useDeleteOneRelationMetadataItem.test.tsx

@@ -1,63 +0,0 @@
-import { MockedProvider } from '@apollo/client/testing';
-import { act, renderHook } from '@testing-library/react';
-import { ReactNode } from 'react';
-import { RecoilRoot } from 'recoil';
-
-import { useDeleteOneRelationMetadataItem } from '@/object-metadata/hooks/useDeleteOneRelationMetadataItem';
-
-import {
-  query,
-  responseData,
-  variables,
-} from '../__mocks__/useDeleteOneRelationMetadataItem';
-
-import {
-  query as findManyObjectMetadataItemsQuery,
-  responseData as findManyObjectMetadataItemsResponseData,
-} from '../__mocks__/useFindManyObjectMetadataItems';
-
-const mocks = [
-  {
-    request: {
-      query,
-      variables,
-    },
-    result: jest.fn(() => ({
-      data: {
-        deleteOneRelation: responseData,
-      },
-    })),
-  },
-  {
-    request: {
-      query: findManyObjectMetadataItemsQuery,
-      variables: {},
-    },
-    result: jest.fn(() => ({
-      data: findManyObjectMetadataItemsResponseData,
-    })),
-  },
-];
-
-const Wrapper = ({ children }: { children: ReactNode }) => (
-  <RecoilRoot>
-    <MockedProvider mocks={mocks} addTypename={false}>
-      {children}
-    </MockedProvider>
-  </RecoilRoot>
-);
-
-describe('useDeleteOneRelationMetadataItem', () => {
-  it('should work as expected', async () => {
-    const { result } = renderHook(() => useDeleteOneRelationMetadataItem(), {
-      wrapper: Wrapper,
-    });
-
-    await act(async () => {
-      const res =
-        await result.current.deleteOneRelationMetadataItem('idToDelete');
-
-      expect(res.data).toEqual({ deleteOneRelation: responseData });
-    });
-  });
-});

packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx

@@ -3,7 +3,7 @@ import { act } from 'react';
 
 import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { FieldMetadataType, RelationDefinitionType } from '~/generated/graphql';
+import { FieldMetadataType, RelationType } from '~/generated/graphql';
 
 import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
 import {
@@ -11,7 +11,6 @@ import {
   FIELD_RELATION_METADATA_ID,
   objectMetadataId,
   queries,
-  RELATION_METADATA_ID,
   responseData,
   variables,
 } from '../__mocks__/useFieldMetadataItem';
@@ -49,9 +48,8 @@ const fieldRelationMetadataItem: FieldMetadataItem = {
   type: FieldMetadataType.RELATION,
   updatedAt: '',
   isLabelSyncedWithName: true,
-  relationDefinition: {
+  relation: {
-    relationId: RELATION_METADATA_ID,
+    type: RelationType.ONE_TO_MANY,
-    direction: RelationDefinitionType.ONE_TO_MANY,
     sourceFieldMetadata: {
       id: 'e5903d91-9b10-4f3e-b761-35c36e93b7c1',
       name: 'sourceField',
@@ -112,12 +110,12 @@ const mocks = [
   },
   {
     request: {
-      query: queries.deleteMetadataFieldRelation,
+      query: queries.deleteMetadataField,
       variables: variables.deleteMetadataFieldRelation,
     },
     result: jest.fn(() => ({
       data: {
-        deleteOneRelation: responseData.fieldRelation,
+        deleteOneField: responseData.fieldRelation,
       },
     })),
   },
@@ -236,7 +234,7 @@ describe('useFieldMetadataItem', () => {
       );
 
       expect(res.data).toEqual({
-        deleteOneRelation: responseData.fieldRelation,
+        deleteOneField: responseData.fieldRelation,
       });
     });
   });

packages/twenty-front/src/modules/object-metadata/hooks/useCreateOneRelationMetadataItem.ts

@@ -1,47 +0,0 @@
-import { useMutation } from '@apollo/client';
-
-import {
-  CreateOneRelationMetadataItemMutation,
-  CreateOneRelationMetadataItemMutationVariables,
-} from '~/generated-metadata/graphql';
-
-import { CREATE_ONE_RELATION_METADATA_ITEM } from '../graphql/mutations';
-import {
-  formatRelationMetadataInput,
-  FormatRelationMetadataInputParams,
-} from '../utils/formatRelationMetadataInput';
-
-import { useRefreshObjectMetadataItems } from '@/object-metadata/hooks/useRefreshObjectMetadataItem';
-import { useApolloMetadataClient } from './useApolloMetadataClient';
-
-export const useCreateOneRelationMetadataItem = () => {
-  const apolloMetadataClient = useApolloMetadataClient();
-
-  const [mutate] = useMutation<
-    CreateOneRelationMetadataItemMutation,
-    CreateOneRelationMetadataItemMutationVariables
-  >(CREATE_ONE_RELATION_METADATA_ITEM, {
-    client: apolloMetadataClient,
-  });
-
-  const { refreshObjectMetadataItems } =
-    useRefreshObjectMetadataItems('network-only');
-
-  const createOneRelationMetadataItem = async (
-    input: FormatRelationMetadataInputParams,
-  ) => {
-    const result = await mutate({
-      variables: {
-        input: { relationMetadata: formatRelationMetadataInput(input) },
-      },
-    });
-
-    await refreshObjectMetadataItems();
-
-    return result;
-  };
-
-  return {
-    createOneRelationMetadataItem,
-  };
-};

packages/twenty-front/src/modules/object-metadata/hooks/useDeleteOneRelationMetadataItem.ts

@@ -1,42 +0,0 @@
-import { useMutation } from '@apollo/client';
-
-import { DELETE_ONE_RELATION_METADATA_ITEM } from '@/object-metadata/graphql/mutations';
-import {
-  DeleteOneRelationMetadataItemMutation,
-  DeleteOneRelationMetadataItemMutationVariables,
-} from '~/generated-metadata/graphql';
-
-import { useRefreshObjectMetadataItems } from '@/object-metadata/hooks/useRefreshObjectMetadataItem';
-import { useApolloMetadataClient } from './useApolloMetadataClient';
-
-export const useDeleteOneRelationMetadataItem = () => {
-  const apolloMetadataClient = useApolloMetadataClient();
-
-  const [mutate] = useMutation<
-    DeleteOneRelationMetadataItemMutation,
-    DeleteOneRelationMetadataItemMutationVariables
-  >(DELETE_ONE_RELATION_METADATA_ITEM, {
-    client: apolloMetadataClient,
-  });
-
-  const { refreshObjectMetadataItems } =
-    useRefreshObjectMetadataItems('network-only');
-
-  const deleteOneRelationMetadataItem = async (
-    idToDelete: DeleteOneRelationMetadataItemMutationVariables['idToDelete'],
-  ) => {
-    const result = await mutate({
-      variables: {
-        idToDelete,
-      },
-    });
-
-    await refreshObjectMetadataItems();
-
-    return result;
-  };
-
-  return {
-    deleteOneRelationMetadataItem,
-  };
-};

packages/twenty-front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts

@@ -1,10 +1,8 @@
-import { useDeleteOneRelationMetadataItem } from '@/object-metadata/hooks/useDeleteOneRelationMetadataItem';
+import { Field, RelationType } from '~/generated-metadata/graphql';
-import { Field, FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { FieldMetadataItem } from '../types/FieldMetadataItem';
 import { formatFieldMetadataItemInput } from '../utils/formatFieldMetadataItemInput';
 
-import { isDefined } from 'twenty-shared/utils';
 import { useCreateOneFieldMetadataItem } from './useCreateOneFieldMetadataItem';
 import { useDeleteOneFieldMetadataItem } from './useDeleteOneFieldMetadataItem';
 import { useUpdateOneFieldMetadataItem } from './useUpdateOneFieldMetadataItem';
@@ -13,7 +11,6 @@ export const useFieldMetadataItem = () => {
   const { createOneFieldMetadataItem } = useCreateOneFieldMetadataItem();
   const { updateOneFieldMetadataItem } = useUpdateOneFieldMetadataItem();
   const { deleteOneFieldMetadataItem } = useDeleteOneFieldMetadataItem();
-  const { deleteOneRelationMetadataItem } = useDeleteOneRelationMetadataItem();
 
   const createMetadataField = (
     input: Pick<
@@ -29,6 +26,12 @@ export const useFieldMetadataItem = () => {
       | 'isLabelSyncedWithName'
     > & {
       objectMetadataId: string;
+      relationCreationPayload?: {
+        type: RelationType;
+        targetObjectMetadataId: string;
+        targetFieldLabel: string;
+        targetFieldIcon: string;
+      };
     },
   ) => {
     const formattedInput = formatFieldMetadataItemInput(input);
@@ -40,6 +43,7 @@ export const useFieldMetadataItem = () => {
       label: formattedInput.label ?? '',
       name: formattedInput.name ?? '',
       isLabelSyncedWithName: formattedInput.isLabelSyncedWithName ?? true,
+      relationCreationPayload: input.relationCreationPayload,
     });
   };
 
@@ -64,12 +68,7 @@ export const useFieldMetadataItem = () => {
     });
 
   const deleteMetadataField = (metadataField: FieldMetadataItem) => {
-    return metadataField.type === FieldMetadataType.RELATION &&
+    return deleteOneFieldMetadataItem(metadataField.id);
-      !isDefined(metadataField.settings?.relationType)
-      ? deleteOneRelationMetadataItem(
-          metadataField.relationDefinition?.relationId,
-        )
-      : deleteOneFieldMetadataItem(metadataField.id);
   };
 
   return {

packages/twenty-front/src/modules/object-metadata/hooks/useGetRelationMetadata.ts

@@ -11,21 +11,18 @@ export const useGetRelationMetadata = () =>
       ({
         fieldMetadataItem,
       }: {
-        fieldMetadataItem: Pick<
+        fieldMetadataItem: Pick<FieldMetadataItem, 'type' | 'relation'>;
-          FieldMetadataItem,
-          'type' | 'relationDefinition'
-        >;
       }) => {
         if (fieldMetadataItem.type !== FieldMetadataType.RELATION) return null;
 
-        const relationDefinition = fieldMetadataItem.relationDefinition;
+        const relation = fieldMetadataItem.relation;
 
-        if (!relationDefinition) return null;
+        if (!relation) return null;
 
         const relationObjectMetadataItem = snapshot
           .getLoadable(
             objectMetadataItemFamilySelector({
-              objectName: relationDefinition.targetObjectMetadata.nameSingular,
+              objectName: relation.targetObjectMetadata.nameSingular,
               objectNameType: 'singular',
             }),
           )
@@ -35,7 +32,7 @@ export const useGetRelationMetadata = () =>
 
         const relationFieldMetadataItem =
           relationObjectMetadataItem.fields.find(
-            (field) => field.id === relationDefinition.targetFieldMetadata.id,
+            (field) => field.id === relation.targetFieldMetadata.id,
           );
 
         if (!relationFieldMetadataItem) return null;
@@ -43,7 +40,7 @@ export const useGetRelationMetadata = () =>
         return {
           relationFieldMetadataItem,
           relationObjectMetadataItem,
-          relationType: relationDefinition.direction,
+          relationType: relation.type,
         };
       },
     [],

packages/twenty-front/src/modules/object-metadata/types/FieldMetadataItem.ts

@@ -1,12 +1,8 @@
+import { FieldMetadataItemRelation } from '@/object-metadata/types/FieldMetadataItemRelation';
 import { FieldDateMetadataSettings } from '@/object-record/record-field/types/FieldMetadata';
 
 import { ThemeColor } from 'twenty-ui/theme';
-import {
+import { Field } from '~/generated-metadata/graphql';
-  Field,
-  Object as MetadataObject,
-  RelationDefinition,
-  RelationDefinitionType,
-} from '~/generated-metadata/graphql';
 
 export type FieldMetadataItemOption = {
   color: ThemeColor;
@@ -18,25 +14,12 @@ export type FieldMetadataItemOption = {
 
 export type FieldMetadataItem = Omit<
   Field,
-  '__typename' | 'defaultValue' | 'options' | 'relationDefinition'
+  '__typename' | 'defaultValue' | 'options' | 'relation'
 > & {
   __typename?: string;
   defaultValue?: any;
   options?: FieldMetadataItemOption[] | null;
-  relationDefinition?: {
+  relation?: FieldMetadataItemRelation | null;
-    relationId: RelationDefinition['relationId'];
-    direction: RelationDefinitionType;
-    sourceFieldMetadata: Pick<Field, 'id' | 'name'>;
-    sourceObjectMetadata: Pick<
-      MetadataObject,
-      'id' | 'nameSingular' | 'namePlural'
-    >;
-    targetFieldMetadata: Pick<Field, 'id' | 'name'>;
-    targetObjectMetadata: Pick<
-      MetadataObject,
-      'id' | 'nameSingular' | 'namePlural'
-    >;
-  } | null;
   settings?: FieldDateMetadataSettings;
   isLabelSyncedWithName?: boolean | null;
 };

packages/twenty-front/src/modules/object-metadata/types/FieldMetadataItemRelation.ts

@@ -0,0 +1,17 @@
+import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
+
+import { Field, RelationType } from '~/generated-metadata/graphql';
+
+export type FieldMetadataItemRelation = {
+  type: RelationType;
+  sourceFieldMetadata: Pick<Field, 'id' | 'name'>;
+  targetFieldMetadata: Pick<Field, 'id' | 'name'>;
+  sourceObjectMetadata: Pick<
+    ObjectMetadataItem,
+    'id' | 'nameSingular' | 'namePlural'
+  >;
+  targetObjectMetadata: Pick<
+    ObjectMetadataItem,
+    'id' | 'nameSingular' | 'namePlural'
+  >;
+};

packages/twenty-front/src/modules/object-metadata/utils/__tests__/shouldFieldBeQueried.test.ts

@@ -1,5 +1,5 @@
 import { shouldFieldBeQueried } from '@/object-metadata/utils/shouldFieldBeQueried';
-import { FieldMetadataType } from '~/generated-metadata/graphql';
+import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
 
 describe('shouldFieldBeQueried', () => {
   describe('if recordGqlFields is absent, we query all except relations', () => {
@@ -11,20 +11,62 @@ describe('shouldFieldBeQueried', () => {
       expect(res).toBe(true);
     });
 
-    it('should not be queried if the field is a relation', () => {
+    it('should not be queried if the field is a relation ONE_TO_MANY', () => {
       const res = shouldFieldBeQueried({
         gqlField: 'fieldName',
-        fieldMetadata: { name: 'fieldName', type: FieldMetadataType.RELATION },
+        fieldMetadata: {
+          name: 'fieldName',
+          type: FieldMetadataType.RELATION,
+          settings: {
+            relationType: RelationType.ONE_TO_MANY,
+          },
+        },
       });
       expect(res).toBe(false);
     });
+
+    it('should not be queried if the field is a relation MANY_TO_ONE', () => {
+      const res = shouldFieldBeQueried({
+        gqlField: 'fieldName',
+        fieldMetadata: {
+          name: 'fieldName',
+          type: FieldMetadataType.RELATION,
+          settings: {
+            relationType: RelationType.MANY_TO_ONE,
+            joinColumnName: 'fieldNameId',
+          },
+        },
+      });
+      expect(res).toBe(false);
+    });
+
+    it('should be queried if the field is a relation MANY_TO_ONE and is the joinColumnName', () => {
+      const res = shouldFieldBeQueried({
+        gqlField: 'fieldNameId',
+        fieldMetadata: {
+          name: 'fieldNameId',
+          type: FieldMetadataType.RELATION,
+          settings: {
+            relationType: RelationType.MANY_TO_ONE,
+            joinColumnName: 'fieldNameId',
+          },
+        },
+      });
+      expect(res).toBe(true);
+    });
   });
 
   describe('if recordGqlFields is present, we respect it', () => {
     it('should be queried if true', () => {
       const res = shouldFieldBeQueried({
         gqlField: 'fieldName',
-        fieldMetadata: { name: 'fieldName', type: FieldMetadataType.RELATION },
+        fieldMetadata: {
+          name: 'fieldName',
+          type: FieldMetadataType.RELATION,
+          settings: {
+            relationType: RelationType.ONE_TO_MANY,
+          },
+        },
         recordGqlFields: { fieldName: true },
       });
       expect(res).toBe(true);
@@ -33,7 +75,13 @@ describe('shouldFieldBeQueried', () => {
     it('should be queried if object', () => {
       const res = shouldFieldBeQueried({
         recordGqlFields: { fieldName: { subFieldName: false } },
-        fieldMetadata: { name: 'fieldName', type: FieldMetadataType.RELATION },
+        fieldMetadata: {
+          name: 'fieldName',
+          type: FieldMetadataType.RELATION,
+          settings: {
+            relationType: RelationType.ONE_TO_MANY,
+          },
+        },
         gqlField: 'fieldName',
       });
       expect(res).toBe(true);
@@ -42,7 +90,13 @@ describe('shouldFieldBeQueried', () => {
     it('should not be queried if false', () => {
       const res = shouldFieldBeQueried({
         gqlField: 'fieldName',
-        fieldMetadata: { name: 'fieldName', type: FieldMetadataType.RELATION },
+        fieldMetadata: {
+          name: 'fieldName',
+          type: FieldMetadataType.RELATION,
+          settings: {
+            relationType: RelationType.ONE_TO_MANY,
+          },
+        },
         recordGqlFields: { fieldName: false },
       });
       expect(res).toBe(false);
@@ -51,7 +105,13 @@ describe('shouldFieldBeQueried', () => {
     it('should not be queried if absent', () => {
       const res = shouldFieldBeQueried({
         gqlField: 'fieldName',
-        fieldMetadata: { name: 'fieldName', type: FieldMetadataType.RELATION },
+        fieldMetadata: {
+          name: 'fieldName',
+          type: FieldMetadataType.RELATION,
+          settings: {
+            relationType: RelationType.ONE_TO_MANY,
+          },
+        },
         recordGqlFields: { otherFieldName: false },
       });
       expect(res).toBe(false);

packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition.ts

@@ -18,16 +18,14 @@ export const formatFieldMetadataItemAsFieldDefinition = ({
   showLabel,
   labelWidth,
 }: FieldMetadataItemAsFieldDefinitionProps): FieldDefinition<FieldMetadata> => {
-  const relationObjectMetadataItem =
+  const relationObjectMetadataItem = field.relation?.targetObjectMetadata;
-    field.relationDefinition?.targetObjectMetadata;
 
-  const relationFieldMetadataId =
+  const relationFieldMetadataId = field.relation?.targetFieldMetadata.id;
-    field.relationDefinition?.targetFieldMetadata.id;
 
   const fieldDefintionMetadata = {
     fieldName: field.name,
     placeHolder: field.label,
-    relationType: field.relationDefinition?.direction,
+    relationType: field.relation?.type,
     relationFieldMetadataId,
     relationObjectMetadataNameSingular:
       relationObjectMetadataItem?.nameSingular ?? '',
@@ -35,8 +33,7 @@ export const formatFieldMetadataItemAsFieldDefinition = ({
       relationObjectMetadataItem?.namePlural ?? '',
     relationObjectMetadataId: relationObjectMetadataItem?.id ?? '',
     objectMetadataNameSingular: objectMetadataItem.nameSingular ?? '',
-    targetFieldMetadataName:
+    targetFieldMetadataName: field.relation?.targetFieldMetadata?.name ?? '',
-      field.relationDefinition?.targetFieldMetadata?.name ?? '',
     options: field.options,
     settings: field.settings,
     isNullable: field.isNullable,

packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts

@@ -8,7 +8,7 @@ export const getRelationObjectMetadataNameSingular = ({
 }: {
   field: ObjectMetadataItem['fields'][0];
 }): string | undefined => {
-  return field.relationDefinition?.targetObjectMetadata.nameSingular;
+  return field.relation?.targetObjectMetadata.nameSingular;
 };
 
 export const getFilterTypeFromFieldType = (

packages/twenty-front/src/modules/object-metadata/utils/formatRelationMetadataInput.ts

@@ -1,62 +0,0 @@
-import { RelationType } from '@/settings/data-model/types/RelationType';
-import {
-  CreateRelationInput,
-  Field,
-  RelationDefinitionType,
-  RelationMetadataType,
-} from '~/generated-metadata/graphql';
-
-import { formatFieldMetadataItemInput } from './formatFieldMetadataItemInput';
-
-export type FormatRelationMetadataInputParams = {
-  relationType: RelationType;
-  field: Pick<Field, 'label' | 'icon' | 'description' | 'name'>;
-  objectMetadataId: string;
-  connect: {
-    field: Pick<Field, 'label' | 'icon' | 'name'>;
-    objectMetadataId: string;
-  };
-};
-
-export const formatRelationMetadataInput = (
-  input: FormatRelationMetadataInputParams,
-): CreateRelationInput => {
-  // /!\ MANY_TO_ONE does not exist on backend.
-  // => Transform into ONE_TO_MANY and invert "from" and "to" data.
-  const isManyToOne = input.relationType === 'MANY_TO_ONE';
-  const relationType = isManyToOne
-    ? RelationDefinitionType.ONE_TO_MANY
-    : (input.relationType as RelationDefinitionType);
-  const { field: fromField, objectMetadataId: fromObjectMetadataId } =
-    isManyToOne ? input.connect : input;
-  const { field: toField, objectMetadataId: toObjectMetadataId } = isManyToOne
-    ? input
-    : input.connect;
-
-  const {
-    description: fromDescription,
-    icon: fromIcon,
-    label: fromLabel = '',
-    name: fromName = '',
-  } = formatFieldMetadataItemInput(fromField);
-  const {
-    description: toDescription,
-    icon: toIcon,
-    label: toLabel = '',
-    name: toName = '',
-  } = formatFieldMetadataItemInput(toField);
-
-  return {
-    fromDescription,
-    fromIcon,
-    fromLabel,
-    fromName,
-    fromObjectMetadataId,
-    relationType: relationType as unknown as RelationMetadataType,
-    toDescription,
-    toIcon,
-    toLabel,
-    toName,
-    toObjectMetadataId,
-  };
-};

packages/twenty-front/src/modules/object-metadata/utils/getFilterFilterableFieldMetadataItems.ts

@@ -1,8 +1,5 @@
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import {
+import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
-  FieldMetadataType,
-  RelationDefinitionType,
-} from '~/generated-metadata/graphql';
 
 export const getFilterFilterableFieldMetadataItems = ({
   isJsonFilterEnabled,
@@ -15,9 +12,7 @@ export const getFilterFilterableFieldMetadataItems = ({
 
     const isRelationFieldHandled = !(
       field.type === FieldMetadataType.RELATION &&
-      field.relationDefinition?.direction !==
+      field.relation?.type !== RelationType.MANY_TO_ONE
-        RelationDefinitionType.MANY_TO_ONE &&
-      field.relationDefinition?.direction !== RelationDefinitionType.ONE_TO_ONE
     );
 
     const isFieldTypeFilterable = [

packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts

@@ -3,7 +3,7 @@ import { isUndefined } from '@sniptt/guards';
 import {
   FieldMetadataType,
   ObjectPermission,
-  RelationDefinitionType,
+  RelationType,
 } from '~/generated-metadata/graphql';
 
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
@@ -18,13 +18,13 @@ type MapFieldMetadataToGraphQLQueryArgs = {
   gqlField: string;
   fieldMetadata: Pick<
     FieldMetadataItem,
-    'name' | 'type' | 'relationDefinition' | 'settings'
+    'name' | 'type' | 'relation' | 'settings'
   >;
   relationRecordGqlFields?: RecordGqlFields;
   computeReferences?: boolean;
   objectPermissionsByObjectMetadataId: Record<string, ObjectPermission>;
 };
-// TODO: change ObjectMetadataItems mock before refactoring with relationDefinition computed field
+// TODO: change ObjectMetadataItems mock before refactoring with relation computed field
 export const mapFieldMetadataToGraphQLQuery = ({
   objectMetadataItems,
   gqlField,
@@ -39,7 +39,7 @@ export const mapFieldMetadataToGraphQLQuery = ({
 
   const objectPermission = getObjectPermissionsForObject(
     objectPermissionsByObjectMetadataId,
-    fieldMetadata.relationDefinition?.targetObjectMetadata.id,
+    fieldMetadata.relation?.targetObjectMetadata.id,
   );
 
   if (fieldIsNonCompositeField) {
@@ -48,13 +48,12 @@ export const mapFieldMetadataToGraphQLQuery = ({
 
   if (
     fieldType === FieldMetadataType.RELATION &&
-    fieldMetadata.relationDefinition?.direction ===
+    fieldMetadata.relation?.type === RelationType.MANY_TO_ONE
-      RelationDefinitionType.MANY_TO_ONE
   ) {
     const relationMetadataItem = objectMetadataItems.find(
       (objectMetadataItem) =>
         objectMetadataItem.id ===
-        fieldMetadata.relationDefinition?.targetObjectMetadata.id,
+        fieldMetadata.relation?.targetObjectMetadata.id,
     );
 
     if (isUndefined(relationMetadataItem)) {
@@ -87,13 +86,12 @@ ${mapObjectMetadataToGraphQLQuery({
 
   if (
     fieldType === FieldMetadataType.RELATION &&
-    fieldMetadata.relationDefinition?.direction ===
+    fieldMetadata.relation?.type === RelationType.ONE_TO_MANY
-      RelationDefinitionType.ONE_TO_MANY
   ) {
     const relationMetadataItem = objectMetadataItems.find(
       (objectMetadataItem) =>
         objectMetadataItem.id ===
-        fieldMetadata.relationDefinition?.targetObjectMetadata.id,
+        fieldMetadata.relation?.targetObjectMetadata.id,
     );
 
     if (isUndefined(relationMetadataItem)) {

packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts

@@ -3,6 +3,7 @@ import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
+import { isFieldRelation } from '@/object-record/record-field/types/guards/isFieldRelation';
 import { isDefined } from 'twenty-shared/utils';
 import { FieldMetadataItem } from '../types/FieldMetadataItem';
 
@@ -12,13 +13,17 @@ export const shouldFieldBeQueried = ({
   recordGqlFields,
 }: {
   gqlField: string;
-  fieldMetadata: Pick<FieldMetadataItem, 'name' | 'type'>;
+  fieldMetadata: Pick<FieldMetadataItem, 'name' | 'type' | 'settings'>;
   objectRecord?: ObjectRecord;
   recordGqlFields?: RecordGqlOperationGqlRecordFields;
 }): any => {
+  const isJoinColumn: boolean =
+    isFieldRelation(fieldMetadata) &&
+    fieldMetadata.settings.joinColumnName === gqlField;
+
   if (
     isUndefinedOrNull(recordGqlFields) &&
-    fieldMetadata.type !== FieldMetadataType.RELATION
+    (fieldMetadata.type !== FieldMetadataType.RELATION || isJoinColumn)
   ) {
     return true;
   }

packages/twenty-front/src/modules/object-metadata/validation-schemas/fieldMetadataItemSchema.ts

@@ -2,12 +2,9 @@ import { z } from 'zod';
 
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { metadataLabelSchema } from '@/object-metadata/validation-schemas/metadataLabelSchema';
-import {
-  FieldMetadataType,
-  RelationDefinitionType,
-} from '~/generated-metadata/graphql';
-import { camelCaseStringSchema } from '~/utils/validation-schemas/camelCaseStringSchema';
 import { themeColorSchema } from 'twenty-ui/theme';
+import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
+import { camelCaseStringSchema } from '~/utils/validation-schemas/camelCaseStringSchema';
 
 export const fieldMetadataItemSchema = (existingLabels?: string[]) => {
   return z.object({
@@ -38,11 +35,10 @@ export const fieldMetadataItemSchema = (existingLabels?: string[]) => {
       .nullable()
       .optional(),
     settings: z.any().optional(),
-    relationDefinition: z
+    relation: z
       .object({
-        __typename: z.literal('RelationDefinition').optional(),
+        __typename: z.literal('Relation').optional(),
-        relationId: z.string().uuid(),
+        type: z.nativeEnum(RelationType),
-        direction: z.nativeEnum(RelationDefinitionType),
         sourceFieldMetadata: z.object({
           __typename: z.literal('Field').optional(),
           id: z.string().uuid(),

packages/twenty-front/src/modules/object-metadata/validation-schemas/objectMetadataItemSchema.ts

@@ -15,6 +15,7 @@ export const objectMetadataItemSchema = z.object({
   indexMetadatas: z.array(indexMetadataItemSchema),
   icon: z.string().startsWith('Icon').trim(),
   id: z.string().uuid(),
+  duplicateCriteria: z.array(z.array(z.string())),
   imageIdentifierFieldMetadataId: z.string().uuid().nullable(),
   isActive: z.boolean(),
   isCustom: z.boolean(),

packages/twenty-front/src/modules/object-record/advanced-filter/utils/getAdvancedFilterInputPlacedholderText.ts

@@ -24,7 +24,7 @@ export const getAdvancedFilterInputPlaceholderText = (
     case FieldMetadataType.ACTOR:
       return 'Select actor';
     case FieldMetadataType.RELATION:
-      return `Select ${fieldMetadataItem.relationDefinition?.targetObjectMetadata.nameSingular}`;
+      return `Select ${fieldMetadataItem.relation?.targetObjectMetadata.nameSingular}`;
     case FieldMetadataType.SELECT:
     case FieldMetadataType.MULTI_SELECT:
       return `Select ${fieldMetadataItem.label}`;

packages/twenty-front/src/modules/object-record/cache/utils/__tests__/isObjectRecordConnection.test.ts

@@ -1,12 +1,10 @@
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { isObjectRecordConnection } from '@/object-record/cache/utils/isObjectRecordConnection';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 describe('isObjectRecordConnection', () => {
-  const relationDefinitionMap: { [K in RelationDefinitionType]: boolean } = {
+  const relationDefinitionMap: { [K in RelationType]: boolean } = {
-    [RelationDefinitionType.MANY_TO_MANY]: true,
+    [RelationType.ONE_TO_MANY]: true,
-    [RelationDefinitionType.ONE_TO_MANY]: true,
+    [RelationType.MANY_TO_ONE]: false,
-    [RelationDefinitionType.MANY_TO_ONE]: false,
-    [RelationDefinitionType.ONE_TO_ONE]: false,
   };
 
   it.each(Object.entries(relationDefinitionMap))(
@@ -15,8 +13,8 @@ describe('isObjectRecordConnection', () => {
       const emptyRecord = {};
       const result = isObjectRecordConnection(
         {
-          direction: relation,
+          type: relation,
-        } as NonNullable<FieldMetadataItem['relationDefinition']>,
+        } as NonNullable<FieldMetadataItem['relation']>,
         emptyRecord,
       );
 

packages/twenty-front/src/modules/object-record/cache/utils/getRecordNodeFromRecord.ts

@@ -8,10 +8,7 @@ import { getRefName } from '@/object-record/cache/utils/getRefName';
 import { RecordGqlNode } from '@/object-record/graphql/types/RecordGqlNode';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { isDefined } from 'twenty-shared/utils';
-import {
+import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
-  FieldMetadataType,
-  RelationDefinitionType,
-} from '~/generated-metadata/graphql';
 import { pascalCase } from '~/utils/string/pascalCase';
 
 export const getRecordNodeFromRecord = <T extends ObjectRecord>({
@@ -63,13 +60,12 @@ export const getRecordNodeFromRecord = <T extends ObjectRecord>({
 
         if (
           field.type === FieldMetadataType.RELATION &&
-          field.relationDefinition?.direction ===
+          field.relation?.type === RelationType.ONE_TO_MANY
-            RelationDefinitionType.ONE_TO_MANY
         ) {
           const oneToManyObjectMetadataItem = objectMetadataItems.find(
             (item) =>
               item.namePlural ===
-              field.relationDefinition?.targetObjectMetadata.namePlural,
+              field.relation?.targetObjectMetadata.namePlural,
           );
 
           if (!oneToManyObjectMetadataItem) {
@@ -103,9 +99,7 @@ export const getRecordNodeFromRecord = <T extends ObjectRecord>({
             }
 
             if (
-              isUndefined(
+              isUndefined(field.relation?.targetObjectMetadata.nameSingular)
-                field.relationDefinition?.targetObjectMetadata.nameSingular,
-              )
             ) {
               return undefined;
             }
@@ -119,7 +113,7 @@ export const getRecordNodeFromRecord = <T extends ObjectRecord>({
             }
 
             const typeName = getObjectTypename(
-              field.relationDefinition?.targetObjectMetadata.nameSingular,
+              field.relation?.targetObjectMetadata.nameSingular,
             );
 
             if (computeReferences) {

packages/twenty-front/src/modules/object-record/cache/utils/isObjectRecordConnection.ts

@@ -1,23 +1,20 @@
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { RecordGqlConnection } from '@/object-record/graphql/types/RecordGqlConnection';
 import { assertUnreachable } from '@/workflow/utils/assertUnreachable';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 
 export const isObjectRecordConnection = (
-  relationDefinition: NonNullable<FieldMetadataItem['relationDefinition']>,
+  relation: NonNullable<FieldMetadataItem['relation']>,
   value: unknown,
 ): value is RecordGqlConnection => {
-  switch (relationDefinition.direction) {
+  switch (relation.type) {
-    case RelationDefinitionType.MANY_TO_MANY:
+    case RelationType.ONE_TO_MANY: {
-    case RelationDefinitionType.ONE_TO_MANY: {
       return true;
     }
-    case RelationDefinitionType.MANY_TO_ONE:
+    case RelationType.MANY_TO_ONE:
-    case RelationDefinitionType.ONE_TO_ONE: {
       return false;
-    }
     default: {
-      return assertUnreachable(relationDefinition.direction);
+      return assertUnreachable(relation.type);
     }
   }
 };

packages/twenty-front/src/modules/object-record/graphql/utils/__tests__/generateDepthOneWithoutRelationsRecordGqlFields.test.ts

@@ -11,7 +11,6 @@ describe('generateDepthOneWithoutRelationsRecordGqlFields', () => {
 {
   "avatarUrl": true,
   "city": true,
-  "companyId": true,
   "createdAt": true,
   "createdBy": true,
   "deletedAt": true,

packages/twenty-front/src/modules/object-record/hooks/__mocks__/personFragments.ts

@@ -67,6 +67,7 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ONE_RELATIONS = `
             opportunityId
             personId
             petId
+            rocketId
             surveyResultId
             taskId
             type
@@ -127,7 +128,6 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ONE_RELATIONS = `
         employees
         id
         idealCustomerProfile
-        internalCompetitions
         introVideo {
           primaryLinkUrl
           primaryLinkLabel
@@ -178,6 +178,7 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ONE_RELATIONS = `
             personId
             petId
             position
+            rocketId
             surveyResultId
             taskId
             updatedAt
@@ -229,6 +230,7 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ONE_RELATIONS = `
             opportunityId
             personId
             petId
+            rocketId
             surveyResultId
             updatedAt
           }
@@ -280,6 +282,7 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ONE_RELATIONS = `
             opportunityId
             personId
             petId
+            rocketId
             surveyResultId
             taskId
             updatedAt
@@ -304,6 +307,7 @@ export const PERSON_FRAGMENT_WITH_DEPTH_ONE_RELATIONS = `
             personId
             petId
             properties
+            rocketId
             surveyResultId
             taskId
             updatedAt

packages/twenty-front/src/modules/object-record/hooks/__tests__/useLazyLoadRecordIndexTable.test.tsx

@@ -40,7 +40,6 @@ const mocks: MockedResponse[] = [
                 __typename
                 avatarUrl
                 city
-                companyId
                 createdAt
                 createdBy {
                   source
@@ -102,7 +101,6 @@ const mocks: MockedResponse[] = [
                         employees
                         id
                         idealCustomerProfile
-                        internalCompetitions
                         introVideo {
                           primaryLinkUrl
                           primaryLinkLabel
@@ -132,6 +130,10 @@ const mocks: MockedResponse[] = [
                       note {
                         __typename
                         body
+                        bodyV2 {
+                          blocknote
+                          markdown
+                        }
                         createdAt
                         createdBy {
                           source
@@ -281,6 +283,22 @@ const mocks: MockedResponse[] = [
                         }
                       }
                       petId
+                      rocket {
+                        __typename
+                        createdAt
+                        createdBy {
+                          source
+                          workspaceMemberId
+                          name
+                          context
+                        }
+                        deletedAt
+                        id
+                        name
+                        position
+                        updatedAt
+                      }
+                      rocketId
                       surveyResult {
                         __typename
                         averageEstimatedNumberOfAtomsInTheUniverse
@@ -352,7 +370,6 @@ const mocks: MockedResponse[] = [
                         employees
                         id
                         idealCustomerProfile
-                        internalCompetitions
                         introVideo {
                           primaryLinkUrl
                           primaryLinkLabel
@@ -514,6 +531,22 @@ const mocks: MockedResponse[] = [
                         }
                       }
                       petId
+                      rocket {
+                        __typename
+                        createdAt
+                        createdBy {
+                          source
+                          workspaceMemberId
+                          name
+                          context
+                        }
+                        deletedAt
+                        id
+                        name
+                        position
+                        updatedAt
+                      }
+                      rocketId
                       surveyResult {
                         __typename
                         averageEstimatedNumberOfAtomsInTheUniverse
@@ -540,6 +573,10 @@ const mocks: MockedResponse[] = [
                         __typename
                         assigneeId
                         body
+                        bodyV2 {
+                          blocknote
+                          markdown
+                        }
                         createdAt
                         createdBy {
                           source

packages/twenty-front/src/modules/object-record/hooks/useAttachRelatedRecordFromRecord.ts

@@ -30,7 +30,7 @@ export const useAttachRelatedRecordFromRecord = ({
   });
 
   const relatedRecordObjectNameSingular =
-    fieldOnObject?.relationDefinition?.targetObjectMetadata.nameSingular;
+    fieldOnObject?.relation?.targetObjectMetadata.nameSingular;
 
   if (!relatedRecordObjectNameSingular) {
     throw new Error(
@@ -43,7 +43,7 @@ export const useAttachRelatedRecordFromRecord = ({
     });
 
   const fieldOnRelatedObject =
-    fieldOnObject?.relationDefinition?.targetFieldMetadata.name;
+    fieldOnObject?.relation?.targetFieldMetadata.name;
 
   if (!fieldOnRelatedObject) {
     throw new Error(`Missing target field for ${fieldNameOnRecordObject}`);

packages/twenty-front/src/modules/object-record/hooks/useDetachRelatedRecordFromRecord.ts

@@ -25,10 +25,10 @@ export const useDetachRelatedRecordFromRecord = ({
   });
 
   const relatedRecordObjectNameSingular =
-    fieldOnObject?.relationDefinition?.targetObjectMetadata.nameSingular;
+    fieldOnObject?.relation?.targetObjectMetadata.nameSingular;
 
   const fieldOnRelatedObject =
-    fieldOnObject?.relationDefinition?.targetFieldMetadata.name;
+    fieldOnObject?.relation?.targetFieldMetadata.name;
 
   if (!relatedRecordObjectNameSingular) {
     throw new Error(

packages/twenty-front/src/modules/object-record/record-field/hooks/__tests__/useToggleEditOnlyInput.test.tsx

@@ -40,6 +40,7 @@ const mocks: MockedResponse[] = [
                 firstName
                 lastName
               }
+              position
               timeFormat
               timeZone
               updatedAt
@@ -76,6 +77,7 @@ const mocks: MockedResponse[] = [
                   opportunityId
                   personId
                   petId
+                  rocketId
                   surveyResultId
                   taskId
                   type
@@ -112,6 +114,7 @@ const mocks: MockedResponse[] = [
                   personId
                   petId
                   position
+                  rocketId
                   surveyResultId
                   taskId
                   updatedAt
@@ -124,7 +127,6 @@ const mocks: MockedResponse[] = [
             }
             id
             idealCustomerProfile
-            internalCompetitions
             introVideo {
               primaryLinkUrl
               primaryLinkLabel
@@ -148,6 +150,7 @@ const mocks: MockedResponse[] = [
                   opportunityId
                   personId
                   petId
+                  rocketId
                   surveyResultId
                   updatedAt
                 }
@@ -248,6 +251,7 @@ const mocks: MockedResponse[] = [
                   opportunityId
                   personId
                   petId
+                  rocketId
                   surveyResultId
                   taskId
                   updatedAt
@@ -272,6 +276,7 @@ const mocks: MockedResponse[] = [
                   personId
                   petId
                   properties
+                  rocketId
                   surveyResultId
                   taskId
                   updatedAt

packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/__stories__/RelationFromManyFieldInput.stories.tsx

@@ -22,7 +22,7 @@ import { RecordFieldComponentInstanceContext } from '@/object-record/record-fiel
 import { MultipleRecordPickerHotkeyScope } from '@/object-record/record-picker/multiple-record-picker/types/MultipleRecordPickerHotkeyScope';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
 import { FieldMetadataType } from 'twenty-shared/types';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 
 const RelationWorkspaceSetterEffect = () => {
   const setCurrentWorkspace = useSetRecoilState(currentWorkspaceState);
@@ -49,7 +49,7 @@ const RelationManyFieldInputWithContext = () => {
       iconName: 'IconLink',
       metadata: {
         fieldName: 'people',
-        relationType: RelationDefinitionType.ONE_TO_MANY,
+        relationType: RelationType.ONE_TO_MANY,
         relationObjectMetadataNamePlural: 'companies',
         relationObjectMetadataNameSingular: CoreObjectNameSingular.Company,
         objectMetadataNameSingular: 'company',

packages/twenty-front/src/modules/object-record/record-field/meta-types/input/hooks/useAddNewRecordAndOpenRightDrawer.ts

@@ -9,11 +9,8 @@ import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
 import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
 import { viewableRecordIdState } from '@/object-record/record-right-drawer/states/viewableRecordIdState';
 import { viewableRecordNameSingularState } from '@/object-record/record-right-drawer/states/viewableRecordNameSingularState';
-import {
-  FieldMetadataType,
-  RelationDefinitionType,
-} from '~/generated-metadata/graphql';
 import { isDefined } from 'twenty-shared/utils';
+import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
 
 type RecordDetailRelationSectionProps = {
   relationObjectMetadataNameSingular: string;
@@ -38,8 +35,8 @@ export const useAddNewRecordAndOpenRightDrawer = ({
 
   const { updateOneRecord } = useUpdateOneRecord({
     objectNameSingular:
-      relationFieldMetadataItem?.relationDefinition?.targetObjectMetadata
+      relationFieldMetadataItem?.relation?.targetObjectMetadata.nameSingular ??
-        .nameSingular ?? 'workspaceMember',
+      'workspaceMember',
   });
 
   const { openRecordInCommandMenu } = useOpenRecordInCommandMenu();
@@ -47,8 +44,7 @@ export const useAddNewRecordAndOpenRightDrawer = ({
   if (
     relationObjectMetadataNameSingular === 'workspaceMember' ||
     !isDefined(
-      relationFieldMetadataItem?.relationDefinition?.targetObjectMetadata
+      relationFieldMetadataItem?.relation?.targetObjectMetadata.nameSingular,
-        .nameSingular,
     )
   ) {
     return {
@@ -83,24 +79,22 @@ export const useAddNewRecordAndOpenRightDrawer = ({
           : { id: newRecordId, name: searchInput ?? '' };
 
       if (
-        relationFieldMetadataItem?.relationDefinition?.direction ===
+        relationFieldMetadataItem?.relation?.type === RelationType.MANY_TO_ONE
-        RelationDefinitionType.MANY_TO_ONE
       ) {
         createRecordPayload[
-          `${relationFieldMetadataItem?.relationDefinition?.sourceFieldMetadata.name}Id`
+          `${relationFieldMetadataItem?.relation?.sourceFieldMetadata.name}Id`
         ] = recordId;
       }
 
       await createOneRecord(createRecordPayload);
 
       if (
-        relationFieldMetadataItem?.relationDefinition?.direction ===
+        relationFieldMetadataItem?.relation?.type === RelationType.ONE_TO_MANY
-        RelationDefinitionType.ONE_TO_MANY
       ) {
         await updateOneRecord({
           idToUpdate: recordId,
           updateOneRecordInput: {
-            [`${relationFieldMetadataItem?.relationDefinition?.targetFieldMetadata.name}Id`]:
+            [`${relationFieldMetadataItem?.relation?.targetFieldMetadata.name}Id`]:
               newRecordId,
           },
         });

packages/twenty-front/src/modules/object-record/record-field/types/FieldMetadata.ts

@@ -4,7 +4,7 @@ import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { ConnectedAccountProvider } from 'twenty-shared/types';
 import { ThemeColor } from 'twenty-ui/theme';
 import { z } from 'zod';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 import { CurrencyCode } from './CurrencyCode';
 
 type BaseFieldMetadata = {
@@ -132,7 +132,7 @@ export type FieldRelationMetadata = BaseFieldMetadata & {
   relationObjectMetadataNamePlural: string;
   relationObjectMetadataNameSingular: string;
   relationObjectMetadataId: string;
-  relationType?: RelationDefinitionType;
+  relationType?: RelationType;
   targetFieldMetadataName?: string;
   useEditButton?: boolean;
   settings?: null;

packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelationFromManyObjects.ts

@@ -1,6 +1,6 @@
 import { isFieldRelation } from '@/object-record/record-field/types/guards/isFieldRelation';
 
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 import { FieldDefinition } from '../FieldDefinition';
 import { FieldMetadata, FieldRelationMetadata } from '../FieldMetadata';
 
@@ -8,4 +8,4 @@ export const isFieldRelationFromManyObjects = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type' | 'metadata'>,
 ): field is FieldDefinition<FieldRelationMetadata> =>
   isFieldRelation(field) &&
-  field.metadata.relationType === RelationDefinitionType.ONE_TO_MANY;
+  field.metadata.relationType === RelationType.ONE_TO_MANY;

packages/twenty-front/src/modules/object-record/record-field/types/guards/isFieldRelationToOneObject.ts

@@ -1,6 +1,6 @@
 import { isFieldRelation } from '@/object-record/record-field/types/guards/isFieldRelation';
 
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 import { FieldDefinition } from '../FieldDefinition';
 import { FieldMetadata, FieldRelationMetadata } from '../FieldMetadata';
 
@@ -8,4 +8,4 @@ export const isFieldRelationToOneObject = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type' | 'metadata'>,
 ): field is FieldDefinition<FieldRelationMetadata> =>
   isFieldRelation(field) &&
-  field.metadata.relationType === RelationDefinitionType.MANY_TO_ONE;
+  field.metadata.relationType === RelationType.MANY_TO_ONE;

packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/computeViewRecordGqlOperationFilter.test.ts

@@ -14,6 +14,10 @@ const companyMockObjectMetadataItem = generatedMockObjectMetadataItems.find(
   (item) => item.nameSingular === 'company',
 )!;
 
+const petMockObjectMetadataItem = generatedMockObjectMetadataItems.find(
+  (item) => item.nameSingular === 'pet',
+)!;
+
 const personMockObjectMetadataItem = generatedMockObjectMetadataItems.find(
   (item) => item.nameSingular === 'person',
 )!;
@@ -1364,21 +1368,21 @@ describe('should work as expected for the different field types', () => {
   });
 
   it('select field type with empty options', () => {
-    const selectFieldMetadata = companyMockObjectMetadataItem.fields.find(
+    const selectFieldMetadata = petMockObjectMetadataItem.fields.find(
       (field) => field.type === FieldMetadataType.SELECT,
     );
 
     if (!selectFieldMetadata) {
       throw new Error(
-        `Select field metadata not found ${companyMockObjectMetadataItem.fields.map((field) => [field.name, field.type])}`,
+        `Select field metadata not found ${petMockObjectMetadataItem.fields.map((field) => [field.name, field.type])}`,
       );
     }
 
     const selectFilterIs: RecordFilter = {
-      id: 'company-select-filter-is',
+      id: 'pet-select-filter-is',
-      value: '["option1",""]',
+      value: '["DOG",""]',
       fieldMetadataId: selectFieldMetadata?.id,
-      displayValue: '["option1",""]',
+      displayValue: '["Dog",""]',
       operand: ViewFilterOperand.Is,
       label: 'Select',
       type: FieldMetadataType.SELECT,
@@ -1386,9 +1390,9 @@ describe('should work as expected for the different field types', () => {
 
     const selectFilterIsNot: RecordFilter = {
       id: 'company-select-filter-is-not',
-      value: '["option1",""]',
+      value: '["DOG",""]',
       fieldMetadataId: selectFieldMetadata.id,
-      displayValue: '["option1",""]',
+      displayValue: '["Dog",""]',
       operand: ViewFilterOperand.IsNot,
       label: 'Select',
       type: FieldMetadataType.SELECT,
@@ -1398,7 +1402,7 @@ describe('should work as expected for the different field types', () => {
       filterValueDependencies: mockFilterValueDependencies,
       recordFilters: [selectFilterIs, selectFilterIsNot],
       recordFilterGroups: [],
-      fields: companyMockObjectMetadataItem.fields,
+      fields: petMockObjectMetadataItem.fields,
     });
 
     expect(result).toEqual({
@@ -1407,7 +1411,7 @@ describe('should work as expected for the different field types', () => {
           or: [
             {
               [selectFieldMetadata.name]: {
-                in: ['option1'],
+                in: ['DOG'],
               },
             },
             {
@@ -1422,7 +1426,7 @@ describe('should work as expected for the different field types', () => {
             {
               not: {
                 [selectFieldMetadata.name]: {
-                  in: ['option1'],
+                  in: ['DOG'],
                 },
               },
             },

packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useExportFetchRecords.test.ts

@@ -17,52 +17,52 @@ import { generatedMockObjectMetadataItems } from '~/testing/mock-data/generatedM
 
 const mockPerson = {
   __typename: 'Person',
-  updatedAt: '2021-08-03T19:20:06.000Z',
+  avatarUrl: 'avatarUrl',
-  whatsapp: {
+  city: 'city',
-    primaryPhoneNumber: '+1',
+  companyId: '1',
-    primaryPhoneCountryCode: '234-567-890',
+  createdAt: '2021-08-03T19:20:06.000Z',
-    primaryPhoneCallingCode: '+33',
+  createdBy: {
-    additionalPhones: [],
+    name: 'name',
+    source: 'source',
+    workspaceMemberId: '1',
   },
+  deletedAt: null,
+  emails: {
+    additionalEmails: [],
+    primaryEmail: 'email',
+  },
+  id: '123',
+  intro: 'intro',
+  jobTitle: 'jobTitle',
   linkedinLink: {
-    primaryLinkUrl: 'https://www.linkedin.com',
     primaryLinkLabel: 'linkedin',
+    primaryLinkUrl: 'https://www.linkedin.com',
     secondaryLinks: ['https://www.linkedin.com'],
   },
   name: {
     firstName: 'firstName',
     lastName: 'lastName',
   },
-  emails: {
+  performanceRating: 1,
-    primaryEmail: 'email',
+  phones: {
-    additionalEmails: [],
+    additionalPhones: [],
+    primaryPhoneCountryCode: '234-567-890',
+    primaryPhoneNumber: '+1',
   },
   position: 'position',
-  createdBy: {
+  updatedAt: '2021-08-03T19:20:06.000Z',
-    source: 'source',
+  whatsapp: {
-    workspaceMemberId: '1',
+    additionalPhones: [],
-    name: 'name',
+    primaryPhoneCallingCode: '+33',
+    primaryPhoneCountryCode: '234-567-890',
+    primaryPhoneNumber: '+1',
   },
-  avatarUrl: 'avatarUrl',
+  workPreference: 'workPreference',
-  jobTitle: 'jobTitle',
   xLink: {
-    primaryLinkUrl: 'https://www.linkedin.com',
     primaryLinkLabel: 'linkedin',
+    primaryLinkUrl: 'https://www.linkedin.com',
     secondaryLinks: ['https://www.linkedin.com'],
   },
-  performanceRating: 1,
-  createdAt: '2021-08-03T19:20:06.000Z',
-  phones: {
-    primaryPhoneNumber: '+1',
-    primaryPhoneCountryCode: '234-567-890',
-    additionalPhones: [],
-  },
-  id: '123',
-  city: 'city',
-  companyId: '1',
-  intro: 'intro',
-  deletedAt: null,
-  workPreference: 'workPreference',
 };
 
 const Wrapper = getJestMetadataAndApolloMocksAndActionMenuWrapper({
@@ -238,7 +238,7 @@ describe('useRecordData', () => {
                   displayFormat: 'RELATIVE',
                 },
               },
-              position: 10,
+              position: 9,
               showLabel: undefined,
               size: 100,
               type: 'DATE_TIME',

packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useExportRecords.test.ts

@@ -1,10 +1,7 @@
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
 
-import {
+import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
-  FieldMetadataType,
-  RelationDefinitionType,
-} from '~/generated-metadata/graphql';
 import { displayedExportProgress, generateCsv } from '../useExportRecords';
 
 jest.useFakeTimers();
@@ -23,7 +20,7 @@ describe('generateCsv', () => {
         label: 'Relation',
         metadata: {
           fieldName: 'relation',
-          relationType: RelationDefinitionType.MANY_TO_ONE,
+          relationType: RelationType.MANY_TO_ONE,
         },
       },
     ] as ColumnDefinition<FieldMetadata>[];

packages/twenty-front/src/modules/object-record/record-index/export/hooks/useExportRecords.ts

@@ -15,7 +15,7 @@ import { COMPOSITE_FIELD_SUB_FIELD_LABELS } from '@/settings/data-model/constant
 import { t } from '@lingui/core/macro';
 import { saveAs } from 'file-saver';
 import { isDefined } from 'twenty-shared/utils';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 import { FieldMetadataType } from '~/generated/graphql';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
@@ -39,7 +39,7 @@ export const generateCsv: GenerateExport = ({
   const columnsToExport = columns.filter(
     (col) =>
       !('relationType' in col.metadata && col.metadata.relationType) ||
-      col.metadata.relationType === RelationDefinitionType.MANY_TO_ONE,
+      col.metadata.relationType === RelationType.MANY_TO_ONE,
   );
 
   const objectIdColumn: ColumnDefinition<FieldMetadata> = {

packages/twenty-front/src/modules/object-record/record-show/components/FieldsCard.tsx

@@ -96,7 +96,7 @@ export const FieldsCard = ({
       ) &&
       getObjectPermissionsForObject(
         objectPermissionsByObjectMetadataId,
-        fieldMetadataItem.relationDefinition?.targetObjectMetadata.id,
+        fieldMetadataItem.relation?.targetObjectMetadata.id,
       ).canReadObjectRecords,
   );
 

packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationRecordsListItem.tsx

@@ -47,7 +47,7 @@ import {
 import { LightIconButton } from 'twenty-ui/input';
 import { MenuItem } from 'twenty-ui/navigation';
 import { AnimatedEaseInOut } from 'twenty-ui/utilities';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 
 const StyledListItem = styled(RecordDetailRecordsListItem)<{
   isDropdownOpen?: boolean;
@@ -113,7 +113,7 @@ export const RecordDetailRelationRecordsListItem = ({
     relationType,
   } = fieldDefinition.metadata as FieldRelationMetadata;
 
-  const isToOneObject = relationType === RelationDefinitionType.MANY_TO_ONE;
+  const isToOneObject = relationType === RelationType.MANY_TO_ONE;
   const { objectMetadataItem: relationObjectMetadataItem } =
     useObjectMetadataItem({
       objectNameSingular: relationObjectMetadataNameSingular,

packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSection.tsx

@@ -21,7 +21,7 @@ import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { useLingui } from '@lingui/react/macro';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 import { getAppPath } from '~/utils/navigation/getAppPath';
 
 type RecordDetailRelationSectionProps = {
@@ -57,8 +57,8 @@ export const RecordDetailRelationSection = ({
   >(recordStoreFamilySelector({ recordId, fieldName }));
 
   // TODO: use new relation type
-  const isToOneObject = relationType === RelationDefinitionType.MANY_TO_ONE;
+  const isToOneObject = relationType === RelationType.MANY_TO_ONE;
-  const isToManyObjects = relationType === RelationDefinitionType.ONE_TO_MANY;
+  const isToManyObjects = relationType === RelationType.ONE_TO_MANY;
 
   const relationRecords: ObjectRecord[] =
     fieldValue && isToOneObject

packages/twenty-front/src/modules/object-record/record-show/record-detail-section/components/RecordDetailRelationSectionDropdown.tsx

@@ -28,7 +28,7 @@ import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
 import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { IconForbid, IconPencil, IconPlus } from 'twenty-ui/display';
 import { LightIconButton } from 'twenty-ui/input';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 
 type RecordDetailRelationSectionDropdownProps = {
   loading: boolean;
@@ -61,8 +61,8 @@ export const RecordDetailRelationSectionDropdown = ({
   >(recordStoreFamilySelector({ recordId, fieldName }));
 
   // TODO: use new relation type
-  const isToOneObject = relationType === RelationDefinitionType.MANY_TO_ONE;
+  const isToOneObject = relationType === RelationType.MANY_TO_ONE;
-  const isToManyObjects = relationType === RelationDefinitionType.ONE_TO_MANY;
+  const isToManyObjects = relationType === RelationType.ONE_TO_MANY;
 
   const relationRecords: ObjectRecord[] =
     fieldValue && isToOneObject

packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/mock.ts

@@ -36,8 +36,8 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: null,
         options: null,
-        relationDefinition: {
+        relation: {
-          __typename: 'RelationDefinition',
+          __typename: 'Relation',
           relationId: '0cf72416-3d94-4d94-abf3-7dc9d734435b',
           direction: 'MANY_TO_ONE',
           sourceObjectMetadata: {
@@ -80,7 +80,7 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: "''",
         options: null,
-        relationDefinition: null,
+        relation: null,
       },
       {
         __typename: 'field',
@@ -98,7 +98,7 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: "''",
         options: null,
-        relationDefinition: null,
+        relation: null,
       },
       {
         __typename: 'field',
@@ -116,8 +116,8 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: null,
         options: null,
-        relationDefinition: {
+        relation: {
-          __typename: 'RelationDefinition',
+          __typename: 'Relation',
           relationId: 'd76f949d-023d-4b45-a71e-f39e3b1562ba',
           direction: 'ONE_TO_MANY',
           sourceObjectMetadata: {
@@ -160,8 +160,8 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: null,
         options: null,
-        relationDefinition: {
+        relation: {
-          __typename: 'RelationDefinition',
+          __typename: 'Relation',
           relationId: 'a5a61d23-8ac9-4014-9441-ec3a1781a661',
           direction: 'ONE_TO_MANY',
           sourceObjectMetadata: {
@@ -204,8 +204,8 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: null,
         options: null,
-        relationDefinition: {
+        relation: {
-          __typename: 'RelationDefinition',
+          __typename: 'Relation',
           relationId: '456f7875-b48c-4795-a0c7-a69d7339afee',
           direction: 'ONE_TO_MANY',
           sourceObjectMetadata: {
@@ -248,7 +248,7 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: 'now',
         options: null,
-        relationDefinition: null,
+        relation: null,
       },
       {
         __typename: 'field',
@@ -266,8 +266,8 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: null,
         options: null,
-        relationDefinition: {
+        relation: {
-          __typename: 'RelationDefinition',
+          __typename: 'Relation',
           relationId: '31542774-fb15-4d01-b00b-8fc94887f458',
           direction: 'ONE_TO_MANY',
           sourceObjectMetadata: {
@@ -313,7 +313,7 @@ export const mockPerformance = {
           primaryLinkLabel: "''",
         },
         options: null,
-        relationDefinition: null,
+        relation: null,
       },
       {
         __typename: 'field',
@@ -331,8 +331,8 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: null,
         options: null,
-        relationDefinition: {
+        relation: {
-          __typename: 'RelationDefinition',
+          __typename: 'Relation',
           relationId: 'c0cc3456-afa4-46e0-820d-2db0b63a8273',
           direction: 'ONE_TO_MANY',
           sourceObjectMetadata: {
@@ -375,7 +375,7 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: "''",
         options: null,
-        relationDefinition: null,
+        relation: null,
       },
       {
         __typename: 'field',
@@ -393,7 +393,7 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: null,
         options: null,
-        relationDefinition: null,
+        relation: null,
       },
       {
         __typename: 'field',
@@ -411,7 +411,7 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: "''",
         options: null,
-        relationDefinition: null,
+        relation: null,
       },
       {
         __typename: 'field',
@@ -429,7 +429,7 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: "''",
         options: null,
-        relationDefinition: null,
+        relation: null,
       },
       {
         __typename: 'field',
@@ -447,7 +447,7 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: 'now',
         options: null,
-        relationDefinition: null,
+        relation: null,
       },
       {
         __typename: 'field',
@@ -465,7 +465,7 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: null,
         options: null,
-        relationDefinition: null,
+        relation: null,
       },
       {
         __typename: 'field',
@@ -483,8 +483,8 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: null,
         options: null,
-        relationDefinition: {
+        relation: {
-          __typename: 'RelationDefinition',
+          __typename: 'Relation',
           relationId: '25150feb-fcd7-407e-b5fa-ffe58a0450ac',
           direction: 'ONE_TO_MANY',
           sourceObjectMetadata: {
@@ -530,7 +530,7 @@ export const mockPerformance = {
           firstName: "''",
         },
         options: null,
-        relationDefinition: null,
+        relation: null,
       },
       {
         __typename: 'field',
@@ -551,7 +551,7 @@ export const mockPerformance = {
           primaryLinkLabel: "''",
         },
         options: null,
-        relationDefinition: null,
+        relation: null,
       },
       {
         __typename: 'field',
@@ -569,8 +569,8 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: null,
         options: null,
-        relationDefinition: {
+        relation: {
-          __typename: 'RelationDefinition',
+          __typename: 'Relation',
           relationId: 'e2eb7156-6e65-4bf8-922b-670179744f27',
           direction: 'ONE_TO_MANY',
           sourceObjectMetadata: {
@@ -613,7 +613,7 @@ export const mockPerformance = {
         updatedAt: '2024-05-16T10:54:27.788Z',
         defaultValue: 'uuid',
         options: null,
-        relationDefinition: null,
+        relation: null,
       },
     ],
   },

packages/twenty-front/src/modules/object-record/record-table/hooks/useBuildRecordInputFromFilters.ts

@@ -35,7 +35,7 @@ export const useBuildRecordInputFromFilters = ({
         const value = buildValueFromFilter({
           filter,
           options: fieldMetadataItem.options ?? undefined,
-          relationType: fieldMetadataItem.relationDefinition?.direction,
+          relationType: fieldMetadataItem.relation?.type,
           currentWorkspaceMember: currentWorkspaceMember ?? undefined,
           label: filter.label,
         });

packages/twenty-front/src/modules/object-record/record-table/utils/buildRecordInputFromFilter.spec.ts

@@ -3,7 +3,7 @@ import { FilterableFieldType } from '@/object-record/record-filter/types/Filtera
 import { RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { ColorScheme } from '@/workspace-member/types/WorkspaceMember';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 import { buildValueFromFilter } from './buildRecordInputFromFilter';
 
 // TODO: fix the dates, and test the not supported types
@@ -238,7 +238,7 @@ describe('buildValueFromFilter', () => {
           isCurrentWorkspaceMemberSelected: false,
           selectedRecordIds: ['record-1'],
         }),
-        relationType: RelationDefinitionType.MANY_TO_ONE,
+        relationType: RelationType.MANY_TO_ONE,
         label: 'belongs to one',
         expected: 'record-1',
       },
@@ -248,7 +248,7 @@ describe('buildValueFromFilter', () => {
           isCurrentWorkspaceMemberSelected: true,
           selectedRecordIds: ['record-1'],
         }),
-        relationType: RelationDefinitionType.MANY_TO_ONE,
+        relationType: RelationType.MANY_TO_ONE,
         label: 'Assignee',
         expected: 'current-workspace-member-id',
       },
@@ -258,7 +258,7 @@ describe('buildValueFromFilter', () => {
           isCurrentWorkspaceMemberSelected: false,
           selectedRecordIds: ['record-1', 'record-2'],
         }),
-        relationType: RelationDefinitionType.MANY_TO_MANY,
+        relationType: RelationType.ONE_TO_MANY,
         label: 'hasmany',
         expected: undefined,
       },
@@ -268,7 +268,7 @@ describe('buildValueFromFilter', () => {
           isCurrentWorkspaceMemberSelected: false,
           selectedRecordIds: ['record-1'],
         }),
-        relationType: RelationDefinitionType.MANY_TO_ONE,
+        relationType: RelationType.MANY_TO_ONE,
         label: 'Assignee',
         expected: undefined,
       },
@@ -278,7 +278,7 @@ describe('buildValueFromFilter', () => {
           isCurrentWorkspaceMemberSelected: false,
           selectedRecordIds: ['record-1'],
         }),
-        relationType: RelationDefinitionType.MANY_TO_ONE,
+        relationType: RelationType.MANY_TO_ONE,
         label: 'Assignee',
         expected: undefined,
       },

packages/twenty-front/src/modules/object-record/record-table/utils/buildRecordInputFromFilter.ts

@@ -9,7 +9,7 @@ import {
 import { FILTER_OPERANDS_MAP } from '@/object-record/record-filter/utils/getRecordFilterOperands';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { assertUnreachable, parseJson } from 'twenty-shared/utils';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 
 export const buildValueFromFilter = ({
   filter,
@@ -20,7 +20,7 @@ export const buildValueFromFilter = ({
 }: {
   filter: RecordFilter;
   options?: FieldMetadataItemOption[];
-  relationType?: RelationDefinitionType;
+  relationType?: RelationType;
   currentWorkspaceMember?: CurrentWorkspaceMember;
   label?: string;
 }) => {
@@ -269,7 +269,7 @@ const computeValueFromFilterMultiSelect = (
 const computeValueFromFilterRelation = (
   operand: RecordFilterToRecordInputOperand<'RELATION'>,
   value: string,
-  relationType?: RelationDefinitionType,
+  relationType?: RelationType,
   currentWorkspaceMember?: CurrentWorkspaceMember,
   label?: string,
 ) => {
@@ -279,10 +279,7 @@ const computeValueFromFilterRelation = (
         isCurrentWorkspaceMemberSelected: boolean;
         selectedRecordIds: string[];
       }>(value);
-      if (
+      if (relationType === RelationType.MANY_TO_ONE) {
-        relationType === RelationDefinitionType.MANY_TO_ONE ||
-        relationType === RelationDefinitionType.ONE_TO_ONE
-      ) {
         if (label === 'Assignee') {
           return parsedValue?.isCurrentWorkspaceMemberSelected
             ? currentWorkspaceMember?.id

packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/__tests__/useOpenObjectRecordsSpreadsheetImportDialog.test.ts

@@ -40,6 +40,7 @@ const companyMocks = [
                 firstName
                 lastName
               }
+              position
               timeFormat
               timeZone
               updatedAt
@@ -76,6 +77,7 @@ const companyMocks = [
                   opportunityId
                   personId
                   petId
+                  rocketId
                   surveyResultId
                   taskId
                   type
@@ -112,6 +114,7 @@ const companyMocks = [
                   personId
                   petId
                   position
+                  rocketId
                   surveyResultId
                   taskId
                   updatedAt
@@ -124,7 +127,6 @@ const companyMocks = [
             }
             id
             idealCustomerProfile
-            internalCompetitions
             introVideo {
               primaryLinkUrl
               primaryLinkLabel
@@ -148,6 +150,7 @@ const companyMocks = [
                   opportunityId
                   personId
                   petId
+                  rocketId
                   surveyResultId
                   updatedAt
                 }
@@ -248,6 +251,7 @@ const companyMocks = [
                   opportunityId
                   personId
                   petId
+                  rocketId
                   surveyResultId
                   taskId
                   updatedAt
@@ -272,6 +276,7 @@ const companyMocks = [
                   personId
                   petId
                   properties
+                  rocketId
                   surveyResultId
                   taskId
                   updatedAt

packages/twenty-front/src/modules/object-record/spreadsheet-import/hooks/useOpenObjectRecordsSpreadsheetImportDialog.ts

@@ -6,10 +6,7 @@ import { useOpenSpreadsheetImportDialog } from '@/spreadsheet-import/hooks/useOp
 import { SpreadsheetImportDialogOptions } from '@/spreadsheet-import/types';
 import { SnackBarVariant } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
-import {
+import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
-  FieldMetadataType,
-  RelationDefinitionType,
-} from '~/generated-metadata/graphql';
 
 export const useOpenObjectRecordsSpreadsheetImportDialog = (
   objectNameSingular: string,
@@ -41,8 +38,7 @@ export const useOpenObjectRecordsSpreadsheetImportDialog = (
           fieldMetadataItem.name !== 'createdAt' &&
           fieldMetadataItem.name !== 'updatedAt' &&
           (fieldMetadataItem.type !== FieldMetadataType.RELATION ||
-            fieldMetadataItem.relationDefinition?.direction ===
+            fieldMetadataItem.relation?.type === RelationType.MANY_TO_ONE),
-              RelationDefinitionType.MANY_TO_ONE),
       )
       .sort((fieldMetadataItemA, fieldMetadataItemB) =>
         fieldMetadataItemA.name.localeCompare(fieldMetadataItemB.name),

packages/twenty-front/src/modules/object-record/utils/computeOptimisticRecordFromInput.ts

@@ -15,7 +15,7 @@ import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { buildOptimisticActorFieldValueFromCurrentWorkspaceMember } from '@/object-record/utils/buildOptimisticActorFieldValueFromCurrentWorkspaceMember';
 import { getForeignKeyNameFromRelationFieldName } from '@/object-record/utils/getForeignKeyNameFromRelationFieldName';
 import { isDefined } from 'twenty-shared/utils';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 import { FieldMetadataType } from '~/generated/graphql';
 
 type ComputeOptimisticCacheRecordInputArgs = {
@@ -67,16 +67,16 @@ export const computeOptimisticRecordFromInput = ({
 
     if (isFieldUuid(fieldMetadataItem)) {
       const isRelationFieldId = objectMetadataItem.fields.some(
-        ({ type, relationDefinition }) => {
+        ({ type, relation }) => {
           if (type !== FieldMetadataType.RELATION) {
             return false;
           }
 
-          if (!isDefined(relationDefinition)) {
+          if (!isDefined(relation)) {
             return false;
           }
 
-          const sourceFieldName = relationDefinition.sourceFieldMetadata.name;
+          const sourceFieldName = relation.sourceFieldMetadata.name;
           return (
             getForeignKeyNameFromRelationFieldName(sourceFieldName) ===
             fieldMetadataItem.name
@@ -115,16 +115,12 @@ export const computeOptimisticRecordFromInput = ({
       continue;
     }
 
-    if (
+    if (fieldMetadataItem.relation?.type === RelationType.ONE_TO_MANY) {
-      fieldMetadataItem.relationDefinition?.direction ===
-      RelationDefinitionType.ONE_TO_MANY
-    ) {
       continue;
     }
 
     const isManyToOneRelation =
-      fieldMetadataItem.relationDefinition?.direction ===
+      fieldMetadataItem.relation?.type === RelationType.MANY_TO_ONE;
-      RelationDefinitionType.MANY_TO_ONE;
     if (!isManyToOneRelation) {
       continue;
     }
@@ -166,7 +162,7 @@ export const computeOptimisticRecordFromInput = ({
     }
 
     const targetNameSingular =
-      fieldMetadataItem.relationDefinition?.targetObjectMetadata.nameSingular;
+      fieldMetadataItem.relation?.targetObjectMetadata.nameSingular;
     const targetObjectMetataDataItem = objectMetadataItems.find(
       ({ nameSingular }) => nameSingular === targetNameSingular,
     );

packages/twenty-front/src/modules/object-record/utils/filterAvailableTableColumns.ts

@@ -1,20 +1,10 @@
 import { TABLE_COLUMNS_DENY_LIST } from '@/object-record/constants/TableColumnsDenyList';
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
-import { isFieldRelation } from '@/object-record/record-field/types/guards/isFieldRelation';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
 
 export const filterAvailableTableColumns = (
   columnDefinition: ColumnDefinition<FieldMetadata>,
 ): boolean => {
-  if (
-    isFieldRelation(columnDefinition) &&
-    columnDefinition.metadata?.relationType ===
-      RelationDefinitionType.MANY_TO_MANY
-  ) {
-    return false;
-  }
-
   if (TABLE_COLUMNS_DENY_LIST.includes(columnDefinition.metadata.fieldName)) {
     return false;
   }

packages/twenty-front/src/modules/object-record/utils/generateEmptyFieldValue.ts

@@ -1,13 +1,10 @@
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { FieldActorValue } from '@/object-record/record-field/types/FieldMetadata';
 import { assertUnreachable } from '@/workflow/utils/assertUnreachable';
-import {
+import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
-  FieldMetadataType,
-  RelationDefinitionType,
-} from '~/generated-metadata/graphql';
 
 export type GenerateEmptyFieldValueArgs = {
-  fieldMetadataItem: Pick<FieldMetadataItem, 'type' | 'relationDefinition'>;
+  fieldMetadataItem: Pick<FieldMetadataItem, 'type' | 'relation'>;
 };
 // TODO strictly type each fieldValue following their FieldMetadataType
 export const generateEmptyFieldValue = ({
@@ -60,10 +57,7 @@ export const generateEmptyFieldValue = ({
       return true;
     }
     case FieldMetadataType.RELATION: {
-      if (
+      if (fieldMetadataItem.relation?.type === RelationType.MANY_TO_ONE) {
-        fieldMetadataItem.relationDefinition?.direction ===
-        RelationDefinitionType.MANY_TO_ONE
-      ) {
         return null;
       }
 

packages/twenty-front/src/modules/object-record/utils/getRecordChipGenerators.ts

@@ -48,8 +48,8 @@ export const getRecordChipGenerators = (
 
           const currentObjectNameSingular = objectMetadataItem.nameSingular;
           const fieldObjectNameSingular =
-            fieldMetadataItem.relationDefinition?.targetObjectMetadata
+            fieldMetadataItem.relation?.targetObjectMetadata.nameSingular ??
-              .nameSingular ?? undefined;
+            undefined;
 
           const objectNameSingularToFind = isLabelIdentifier
             ? currentObjectNameSingular

packages/twenty-front/src/modules/object-record/utils/isFieldCellSupported.ts

@@ -2,10 +2,7 @@ import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSi
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { isObjectMetadataAvailableForRelation } from '@/object-metadata/utils/isObjectMetadataAvailableForRelation';
-import {
+import { FieldMetadataType } from '~/generated-metadata/graphql';
-  FieldMetadataType,
-  RelationDefinitionType,
-} from '~/generated-metadata/graphql';
 
 export const isFieldCellSupported = (
   fieldMetadataItem: FieldMetadataItem,
@@ -23,7 +20,7 @@ export const isFieldCellSupported = (
 
   if (fieldMetadataItem.type === FieldMetadataType.RELATION) {
     const relationObjectMetadataItemId =
-      fieldMetadataItem.relationDefinition?.targetObjectMetadata.id;
+      fieldMetadataItem.relation?.targetObjectMetadata.id;
 
     const relationObjectMetadataItem = objectMetadataItems.find(
       (item) => item.id === relationObjectMetadataItemId,
@@ -31,28 +28,25 @@ export const isFieldCellSupported = (
 
     // Hack to display targets on Notes and Tasks
     if (
-      fieldMetadataItem.relationDefinition?.targetObjectMetadata
+      fieldMetadataItem.relation?.targetObjectMetadata?.nameSingular ===
-        ?.nameSingular === CoreObjectNameSingular.NoteTarget &&
+        CoreObjectNameSingular.NoteTarget &&
-      fieldMetadataItem.relationDefinition?.sourceObjectMetadata
+      fieldMetadataItem.relation?.sourceObjectMetadata.nameSingular ===
-        .nameSingular === CoreObjectNameSingular.Note
+        CoreObjectNameSingular.Note
     ) {
       return true;
     }
 
     if (
-      fieldMetadataItem.relationDefinition?.targetObjectMetadata
+      fieldMetadataItem.relation?.targetObjectMetadata?.nameSingular ===
-        ?.nameSingular === CoreObjectNameSingular.TaskTarget &&
+        CoreObjectNameSingular.TaskTarget &&
-      fieldMetadataItem.relationDefinition?.sourceObjectMetadata
+      fieldMetadataItem.relation?.sourceObjectMetadata.nameSingular ===
-        .nameSingular === CoreObjectNameSingular.Task
+        CoreObjectNameSingular.Task
     ) {
       return true;
     }
 
     if (
-      !fieldMetadataItem.relationDefinition ||
+      !fieldMetadataItem.relation ||
-      // TODO: Many to many relations are not supported yet.
-      fieldMetadataItem.relationDefinition.direction ===
-        RelationDefinitionType.MANY_TO_MANY ||
       !relationObjectMetadataItem ||
       !isObjectMetadataAvailableForRelation(relationObjectMetadataItem)
     ) {

packages/twenty-front/src/modules/object-record/utils/prefillRecord.ts

@@ -5,7 +5,7 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { generateEmptyFieldValue } from '@/object-record/utils/generateEmptyFieldValue';
 import { isDefined } from 'twenty-shared/utils';
-import { FieldMetadataType, RelationDefinitionType } from '~/generated/graphql';
+import { FieldMetadataType, RelationType } from '~/generated/graphql';
 
 type PrefillRecordArgs = {
   objectMetadataItem: ObjectMetadataItem;
@@ -19,19 +19,26 @@ export const prefillRecord = <T extends ObjectRecord>({
     objectMetadataItem.fields
       .map((fieldMetadataItem) => {
         const inputValue = input[fieldMetadataItem.name];
-        if (
-          fieldMetadataItem.type === FieldMetadataType.RELATION &&
-          fieldMetadataItem.relationDefinition?.direction ===
-            RelationDefinitionType.MANY_TO_ONE
-        ) {
-          throwIfInputRelationDataIsInconsistent(input, fieldMetadataItem);
-        }
-
         const fieldValue = isUndefined(inputValue)
           ? generateEmptyFieldValue({ fieldMetadataItem })
           : inputValue;
-        return [fieldMetadataItem.name, fieldValue];
+        if (
+          fieldMetadataItem.type === FieldMetadataType.RELATION &&
+          fieldMetadataItem.relation?.type === RelationType.MANY_TO_ONE
+        ) {
+          const joinColumnValue =
+            input[fieldMetadataItem.settings?.joinColumnName];
+          throwIfInputRelationDataIsInconsistent(input, fieldMetadataItem);
+
+          return [
+            [fieldMetadataItem.name, fieldValue],
+            [fieldMetadataItem.settings?.joinColumnName, joinColumnValue],
+          ];
+        }
+
+        return [[fieldMetadataItem.name, fieldValue]];
       })
+      .flat()
       .filter(isDefined),
   ) as T;
 };

packages/twenty-front/src/modules/object-record/utils/sanitizeRecordInput.ts

@@ -2,7 +2,7 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { isSystemSearchVectorField } from '@/object-record/utils/isSystemSearchVectorField';
 import { isDefined } from 'twenty-shared/utils';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 import { FieldMetadataType } from '~/generated/graphql';
 
 export const sanitizeRecordInput = ({
@@ -43,8 +43,7 @@ export const sanitizeRecordInput = ({
         if (
           isDefined(fieldMetadataItem) &&
           fieldMetadataItem.type === FieldMetadataType.RELATION &&
-          fieldMetadataItem.relationDefinition?.direction ===
+          fieldMetadataItem.relation?.type === RelationType.MANY_TO_ONE
-            RelationDefinitionType.MANY_TO_ONE
         ) {
           const relationIdFieldName = `${fieldMetadataItem.name}Id`;
           const relationIdFieldMetadataItem = objectMetadataItem.fields.find(
@@ -61,8 +60,7 @@ export const sanitizeRecordInput = ({
         if (
           isDefined(fieldMetadataItem) &&
           fieldMetadataItem.type === FieldMetadataType.RELATION &&
-          fieldMetadataItem.relationDefinition?.direction ===
+          fieldMetadataItem.relation?.type === RelationType.ONE_TO_MANY
-            RelationDefinitionType.ONE_TO_MANY
         ) {
           return undefined;
         }

packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts

@@ -1,13 +1,6 @@
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { IconComponent, IllustrationIconOneToMany } from 'twenty-ui/display';
+import { RelationType } from '~/generated-metadata/graphql';
 import OneToManySvg from '../assets/OneToMany.svg';
-import OneToOneSvg from '../assets/OneToOne.svg';
-import { RelationType } from '../types/RelationType';
-import {
-  IconComponent,
-  IllustrationIconManyToMany,
-  IllustrationIconOneToMany,
-  IllustrationIconOneToOne,
-} from 'twenty-ui/display';
 
 export const RELATION_TYPES: Record<
   RelationType,
@@ -18,27 +11,15 @@ export const RELATION_TYPES: Record<
     isImageFlipped?: boolean;
   }
 > = {
-  [RelationDefinitionType.ONE_TO_MANY]: {
+  [RelationType.ONE_TO_MANY]: {
     label: 'Has many',
     Icon: IllustrationIconOneToMany,
     imageSrc: OneToManySvg,
   },
-  [RelationDefinitionType.ONE_TO_ONE]: {
+  [RelationType.MANY_TO_ONE]: {
-    label: 'Has one',
-    Icon: IllustrationIconOneToOne,
-    imageSrc: OneToOneSvg,
-  },
-  [RelationDefinitionType.MANY_TO_ONE]: {
     label: 'Belongs to one',
     Icon: IllustrationIconOneToMany,
     imageSrc: OneToManySvg,
     isImageFlipped: true,
   },
-  // Not supported yet
-  [RelationDefinitionType.MANY_TO_MANY]: {
-    label: 'Belongs to many',
-    Icon: IllustrationIconManyToMany,
-    imageSrc: OneToManySvg,
-    isImageFlipped: true,
-  },
 };

packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationForm.tsx

@@ -10,14 +10,13 @@ import { fieldMetadataItemSchema } from '@/object-metadata/validation-schemas/fi
 import { FIELD_NAME_MAXIMUM_LENGTH } from '@/settings/data-model/constants/FieldNameMaximumLength';
 import { RELATION_TYPES } from '@/settings/data-model/constants/RelationTypes';
 import { useRelationSettingsFormInitialValues } from '@/settings/data-model/fields/forms/relation/hooks/useRelationSettingsFormInitialValues';
-import { RelationType } from '@/settings/data-model/types/RelationType';
 import { IconPicker } from '@/ui/input/components/IconPicker';
 import { Select } from '@/ui/input/components/Select';
 import { TextInput } from '@/ui/input/components/TextInput';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import { useLingui } from '@lingui/react/macro';
 import { useIcons } from 'twenty-ui/display';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 
 export const settingsDataModelFieldRelationFormSchema = z.object({
   relation: z.object({
@@ -37,10 +36,7 @@ export const settingsDataModelFieldRelationFormSchema = z.object({
       ),
     objectMetadataId: z.string().uuid(),
     type: z.enum(
-      Object.keys(RELATION_TYPES) as [
+      Object.keys(RELATION_TYPES) as [RelationType, ...RelationType[]],
-        RelationDefinitionType,
-        ...RelationDefinitionType[],
-      ],
     ),
   }),
 });
@@ -78,17 +74,13 @@ const StyledInputsContainer = styled.div`
   width: 100%;
 `;
 
-const RELATION_TYPE_OPTIONS = Object.entries(RELATION_TYPES)
+const RELATION_TYPE_OPTIONS = Object.entries(RELATION_TYPES).map(
-  .filter(
+  ([value, { label, Icon }]) => ({
-    ([value]) =>
-      RelationDefinitionType.ONE_TO_ONE !== value &&
-      RelationDefinitionType.MANY_TO_MANY !== value,
-  )
-  .map(([value, { label, Icon }]) => ({
     label,
     value: value as RelationType,
     Icon,
-  }));
+  }),
+);
 
 export const SettingsDataModelFieldRelationForm = ({
   fieldMetadataItem,
@@ -170,7 +162,7 @@ export const SettingsDataModelFieldRelationForm = ({
       </StyledSelectsContainer>
       <StyledInputsLabel>
         Field on{' '}
-        {selectedRelationType === RelationDefinitionType.MANY_TO_ONE
+        {selectedRelationType === RelationType.MANY_TO_ONE
           ? selectedObjectMetadataItem?.labelSingular
           : selectedObjectMetadataItem?.labelPlural}
       </StyledInputsLabel>

packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/components/SettingsDataModelFieldRelationSettingsFormCard.tsx

@@ -17,8 +17,8 @@ import {
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import {
   FieldMetadataType,
-  RelationDefinition,
+  Relation,
-  RelationDefinitionType,
+  RelationType,
 } from '~/generated-metadata/graphql';
 type SettingsDataModelFieldRelationSettingsFormCardProps = {
   fieldMetadataItem: Pick<FieldMetadataItem, 'icon' | 'label' | 'type'> &
@@ -78,13 +78,16 @@ export const SettingsDataModelFieldRelationSettingsFormCard = ({
 
   if (!relationObjectMetadataItem) return null;
 
-  const relationType = watchFormValue('relation.type', initialRelationType);
+  const relationType: RelationType = watchFormValue(
+    'relation.type',
+    initialRelationType,
+  );
   const relationTypeConfig = RELATION_TYPES[relationType];
 
   const oppositeRelationType =
-    relationType === RelationDefinitionType.MANY_TO_ONE
+    relationType === RelationType.MANY_TO_ONE
-      ? RelationDefinitionType.ONE_TO_MANY
+      ? RelationType.ONE_TO_MANY
-      : RelationDefinitionType.MANY_TO_ONE;
+      : RelationType.MANY_TO_ONE;
 
   return (
     <SettingsDataModelPreviewFormCard
@@ -93,16 +96,15 @@ export const SettingsDataModelFieldRelationSettingsFormCard = ({
           <StyledFieldPreviewCard
             fieldMetadataItem={{
               ...fieldMetadataItem,
-              relationDefinition: {
+              relation: {
-                direction: relationType,
+                type: relationType,
-              } as RelationDefinition,
+              } as Relation,
             }}
             shrink
             objectMetadataItem={objectMetadataItem}
             relationObjectMetadataItem={relationObjectMetadataItem}
             pluralizeLabel={
-              watchFormValue('relation.type') ===
+              watchFormValue('relation.type') === RelationType.MANY_TO_ONE
-              RelationDefinitionType.MANY_TO_ONE
             }
           />
           <StyledRelationImage
@@ -124,16 +126,15 @@ export const SettingsDataModelFieldRelationSettingsFormCard = ({
                   initialRelationFieldMetadataItem.label,
                 ) || 'Field name',
               type: FieldMetadataType.RELATION,
-              relationDefinition: {
+              relation: {
-                direction: oppositeRelationType,
+                type: oppositeRelationType,
-              } as RelationDefinition,
+              } as Relation,
             }}
             shrink
             objectMetadataItem={relationObjectMetadataItem}
             relationObjectMetadataItem={objectMetadataItem}
             pluralizeLabel={
-              watchFormValue('relation.type') !==
+              watchFormValue('relation.type') !== RelationType.MANY_TO_ONE
-              RelationDefinitionType.MANY_TO_ONE
             }
           />
         </StyledPreviewContent>

packages/twenty-front/src/modules/settings/data-model/fields/forms/relation/hooks/useRelationSettingsFormInitialValues.ts

@@ -6,13 +6,13 @@ import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { isObjectMetadataAvailableForRelation } from '@/object-metadata/utils/isObjectMetadataAvailableForRelation';
 import { SettingsDataModelFieldPreviewCardProps } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewCard';
 import { isDefined } from 'twenty-shared/utils';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { RelationType } from '~/generated-metadata/graphql';
 
 export const useRelationSettingsFormInitialValues = ({
   fieldMetadataItem,
   objectMetadataItem,
 }: {
-  fieldMetadataItem?: Pick<FieldMetadataItem, 'type' | 'relationDefinition'>;
+  fieldMetadataItem?: Pick<FieldMetadataItem, 'type' | 'relation'>;
   objectMetadataItem?: SettingsDataModelFieldPreviewCardProps['objectMetadataItem'];
 }) => {
   const { activeObjectMetadataItems } = useFilteredObjectMetadataItems();
@@ -49,7 +49,7 @@ export const useRelationSettingsFormInitialValues = ({
   ]);
 
   const initialRelationType =
-    relationTypeFromFieldMetadata ?? RelationDefinitionType.ONE_TO_MANY;
+    relationTypeFromFieldMetadata ?? RelationType.ONE_TO_MANY;
 
   return {
     disableFieldEdition:
@@ -57,10 +57,7 @@ export const useRelationSettingsFormInitialValues = ({
     disableRelationEdition: !!relationFieldMetadataItem,
     initialRelationFieldMetadataItem: relationFieldMetadataItem ?? {
       icon: initialRelationObjectMetadataItem.icon ?? 'IconUsers',
-      label: [
+      label: [RelationType.MANY_TO_ONE].includes(initialRelationType)
-        RelationDefinitionType.MANY_TO_MANY,
-        RelationDefinitionType.MANY_TO_ONE,
-      ].includes(initialRelationType)
         ? initialRelationObjectMetadataItem.labelPlural
         : initialRelationObjectMetadataItem.labelSingular,
     },

packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelFieldPreview.tsx

@@ -26,7 +26,7 @@ export type SettingsDataModelFieldPreviewProps = {
     | 'defaultValue'
     | 'options'
     | 'settings'
-    | 'relationDefinition'
+    | 'relation'
   > & {
     id?: string;
     name?: string;
@@ -102,7 +102,7 @@ export const SettingsDataModelFieldPreview = ({
     fieldMetadataItem.name || `${fieldMetadataItem.type}-new-field`;
   const recordId =
     previewRecord?.id ??
-    `${objectMetadataItem.nameSingular}-${fieldName}-${fieldMetadataItem.relationDefinition?.direction}-${relationObjectMetadataItem?.nameSingular}-preview`;
+    `${objectMetadataItem.nameSingular}-${fieldName}-${fieldMetadataItem.relation?.type}-${relationObjectMetadataItem?.nameSingular}-preview`;
 
   return (
     <>
@@ -146,7 +146,7 @@ export const SettingsDataModelFieldPreview = ({
                     relationObjectMetadataItem?.nameSingular,
                   options: fieldMetadataItem.options ?? [],
                   settings: fieldMetadataItem.settings,
-                  relationType: fieldMetadataItem.relationDefinition?.direction,
+                  relationType: fieldMetadataItem.relation?.type,
                 },
                 defaultValue: fieldMetadataItem.defaultValue,
               },

packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/useFieldPreviewValue.ts

@@ -8,15 +8,12 @@ import { getFieldPreviewValue } from '@/settings/data-model/fields/preview/utils
 import { getMultiSelectFieldPreviewValue } from '@/settings/data-model/fields/preview/utils/getMultiSelectFieldPreviewValue';
 import { getPhonesFieldPreviewValue } from '@/settings/data-model/fields/preview/utils/getPhonesFieldPreviewValue';
 import { getSelectFieldPreviewValue } from '@/settings/data-model/fields/preview/utils/getSelectFieldPreviewValue';
-import {
+import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
-  FieldMetadataType,
-  RelationDefinitionType,
-} from '~/generated-metadata/graphql';
 
 type UseFieldPreviewParams = {
   fieldMetadataItem: Pick<
     FieldMetadataItem,
-    'type' | 'options' | 'defaultValue' | 'relationDefinition'
+    'type' | 'options' | 'defaultValue' | 'relation'
   >;
   relationObjectMetadataItem?: ObjectMetadataItem;
   skip?: boolean;
@@ -46,8 +43,7 @@ export const useFieldPreviewValue = ({
     case FieldMetadataType.CURRENCY:
       return getCurrencyFieldPreviewValue({ fieldMetadataItem });
     case FieldMetadataType.RELATION:
-      return fieldMetadataItem.relationDefinition?.direction ===
+      return fieldMetadataItem.relation?.type === RelationType.MANY_TO_ONE
-        RelationDefinitionType.MANY_TO_ONE
         ? relationFieldPreviewValue
         : [relationFieldPreviewValue];
     case FieldMetadataType.SELECT:

packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewEffect.tsx

@@ -43,25 +43,22 @@ export const SettingsDataModelOverviewEffect = ({
 
         for (const field of object.fields) {
           if (
-            isDefined(field.relationDefinition) &&
+            isDefined(field.relation) &&
             isDefined(
               items.find(
-                (x) =>
+                (x) => x.id === field.relation?.targetObjectMetadata.id,
-                  x.id === field.relationDefinition?.targetObjectMetadata.id,
               ),
             )
           ) {
-            const sourceObj =
+            const sourceObj = field.relation?.sourceObjectMetadata.namePlural;
-              field.relationDefinition?.sourceObjectMetadata.namePlural;
+            const targetObj = field.relation?.targetObjectMetadata.namePlural;
-            const targetObj =
-              field.relationDefinition?.targetObjectMetadata.namePlural;
 
             edges.push({
               id: `${sourceObj}-${targetObj}`,
               source: object.namePlural,
               sourceHandle: `${field.id}-right`,
-              target: field.relationDefinition.targetObjectMetadata.namePlural,
+              target: field.relation.targetObjectMetadata.namePlural,
-              targetHandle: `${field.relationDefinition.targetObjectMetadata}-left`,
+              targetHandle: `${field.relation.targetObjectMetadata}-left`,
               type: 'smoothstep',
               style: {
                 strokeWidth: 1,
@@ -71,8 +68,8 @@ export const SettingsDataModelOverviewEffect = ({
               markerStart: 'marker',
               data: {
                 sourceField: field.id,
-                targetField: field.relationDefinition.targetFieldMetadata.id,
+                targetField: field.relation.targetFieldMetadata.id,
-                relation: field.relationDefinition.direction,
+                relation: field.relation.type,
                 sourceObject: sourceObj,
                 targetObject: targetObj,
               },

packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewField.tsx

@@ -5,8 +5,8 @@ import { useRecoilValue } from 'recoil';
 
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
 import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
 import { useIcons } from 'twenty-ui/display';
+import { RelationType } from '~/generated-metadata/graphql';
 
 type ObjectFieldRowProps = {
   field: FieldMetadataItem;
@@ -30,7 +30,7 @@ export const ObjectFieldRow = ({ field }: ObjectFieldRowProps) => {
   const { getIcon } = useIcons();
   const theme = useTheme();
 
-  const relatedObjectId = field.relationDefinition?.targetObjectMetadata.id;
+  const relatedObjectId = field.relation?.targetObjectMetadata.id;
 
   const relatedObject = objectMetadataItems.find(
     (x) => x.id === relatedObjectId,
@@ -44,32 +44,28 @@ export const ObjectFieldRow = ({ field }: ObjectFieldRowProps) => {
       <StyledFieldName>{relatedObject?.labelPlural ?? ''}</StyledFieldName>
       <Handle
         type={
-          field.relationDefinition?.direction ===
+          field.relation?.type === RelationType.ONE_TO_MANY
-          RelationDefinitionType.ONE_TO_MANY
             ? 'source'
             : 'target'
         }
         position={Position.Right}
         id={`${field.id}-right`}
         className={
-          field.relationDefinition?.direction ===
+          field.relation?.type === RelationType.ONE_TO_MANY
-          RelationDefinitionType.ONE_TO_MANY
             ? 'right-handle source-handle'
             : 'right-handle target-handle'
         }
       />
       <Handle
         type={
-          field.relationDefinition?.direction ===
+          field.relation?.type === RelationType.ONE_TO_MANY
-          RelationDefinitionType.ONE_TO_MANY
             ? 'source'
             : 'target'
         }
         position={Position.Left}
         id={`${field.id}-left`}
         className={
-          field.relationDefinition?.direction ===
+          field.relation?.type === RelationType.ONE_TO_MANY
-          RelationDefinitionType.ONE_TO_MANY
             ? 'left-handle source-handle'
             : 'left-handle target-handle'
         }

packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx

@@ -19,16 +19,16 @@ import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 import { useMemo } from 'react';
 import { useRecoilState, useRecoilValue } from 'recoil';
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
+import { isDefined } from 'twenty-shared/utils';
+import { IconMinus, IconPlus, useIcons } from 'twenty-ui/display';
+import { LightIconButton } from 'twenty-ui/input';
+import { UndecoratedLink } from 'twenty-ui/navigation';
+import { RelationType } from '~/generated-metadata/graphql';
 import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 import { SettingsObjectDetailTableItem } from '~/pages/settings/data-model/types/SettingsObjectDetailTableItem';
 import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 import { RELATION_TYPES } from '../../constants/RelationTypes';
 import { SettingsObjectFieldDataType } from './SettingsObjectFieldDataType';
-import { isDefined } from 'twenty-shared/utils';
-import { IconMinus, IconPlus, useIcons } from 'twenty-ui/display';
-import { LightIconButton } from 'twenty-ui/input';
-import { UndecoratedLink } from 'twenty-ui/navigation';
 
 type SettingsObjectFieldItemTableRowProps = {
   settingsObjectDetailTableItem: SettingsObjectDetailTableItem;
@@ -240,8 +240,7 @@ export const SettingsObjectFieldItemTableRow = ({
         <SettingsObjectFieldDataType
           Icon={RelationIcon}
           label={
-            relationType === RelationDefinitionType.MANY_TO_ONE ||
+            relationType === RelationType.MANY_TO_ONE
-            relationType === RelationDefinitionType.ONE_TO_ONE
               ? relationObjectMetadataItem?.labelSingular
               : relationObjectMetadataItem?.labelPlural
           }

packages/twenty-front/src/modules/settings/data-model/types/RelationType.ts

@@ -1,3 +0,0 @@
-import { RelationDefinitionType } from '~/generated-metadata/graphql';
-
-export type RelationType = RelationDefinitionType;

packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockColumnDefinitions.ts

@@ -1,10 +1,7 @@
 import { FieldMetadata } from '@/object-record/record-field/types/FieldMetadata';
 import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
 import { filterAvailableTableColumns } from '@/object-record/utils/filterAvailableTableColumns';
-import {
+import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
-  FieldMetadataType,
-  RelationDefinitionType,
-} from '~/generated-metadata/graphql';
 
 export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
   [
@@ -67,7 +64,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       type: FieldMetadataType.RELATION,
       metadata: {
         fieldName: 'favorites',
-        relationType: RelationDefinitionType.ONE_TO_MANY,
+        relationType: RelationType.ONE_TO_MANY,
         relationObjectMetadataNameSingular: '',
         relationObjectMetadataNamePlural: '',
         objectMetadataNameSingular: 'company',
@@ -101,7 +98,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       type: FieldMetadataType.RELATION,
       metadata: {
         fieldName: 'accountOwner',
-        relationType: RelationDefinitionType.MANY_TO_ONE,
+        relationType: RelationType.MANY_TO_ONE,
         relationObjectMetadataNameSingular: 'workspaceMember',
         relationObjectMetadataNamePlural: 'workspaceMembers',
         objectMetadataNameSingular: 'company',
@@ -118,7 +115,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       type: FieldMetadataType.RELATION,
       metadata: {
         fieldName: 'people',
-        relationType: RelationDefinitionType.ONE_TO_MANY,
+        relationType: RelationType.ONE_TO_MANY,
         relationObjectMetadataNameSingular: '',
         relationObjectMetadataNamePlural: '',
         objectMetadataNameSingular: 'company',
@@ -135,7 +132,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       type: FieldMetadataType.RELATION,
       metadata: {
         fieldName: 'attachments',
-        relationType: RelationDefinitionType.ONE_TO_MANY,
+        relationType: RelationType.ONE_TO_MANY,
         relationObjectMetadataNameSingular: '',
         relationObjectMetadataNamePlural: '',
         objectMetadataNameSingular: 'company',
@@ -203,7 +200,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       type: FieldMetadataType.RELATION,
       metadata: {
         fieldName: 'opportunities',
-        relationType: RelationDefinitionType.ONE_TO_MANY,
+        relationType: RelationType.ONE_TO_MANY,
         relationObjectMetadataNameSingular: '',
         relationObjectMetadataNamePlural: '',
         objectMetadataNameSingular: 'company',
@@ -237,7 +234,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
       type: FieldMetadataType.RELATION,
       metadata: {
         fieldName: 'activityTargets',
-        relationType: RelationDefinitionType.ONE_TO_MANY,
+        relationType: RelationType.ONE_TO_MANY,
         relationObjectMetadataNameSingular: '',
         relationObjectMetadataNamePlural: '',
         objectMetadataNameSingular: 'company',

packages/twenty-front/src/modules/views/hooks/internal/useViewFromQueryParams.ts

@@ -87,12 +87,11 @@ export const useViewFromQueryParams = () => {
                 if (!fieldMetadataItem) return null;
 
                 const relationObjectMetadataNameSingular =
-                  fieldMetadataItem.relationDefinition?.targetObjectMetadata
+                  fieldMetadataItem.relation?.targetObjectMetadata
                     ?.nameSingular;
 
                 const relationObjectMetadataNamePlural =
-                  fieldMetadataItem.relationDefinition?.targetObjectMetadata
+                  fieldMetadataItem.relation?.targetObjectMetadata?.namePlural;
-                    ?.namePlural;
 
                 const relationObjectMetadataItem =
                   relationObjectMetadataNameSingular

packages/twenty-front/src/modules/workflow/components/WorkflowEditUpdateEventFieldsMultiSelect.tsx

@@ -2,9 +2,11 @@ import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';
 import { FormMultiSelectFieldInput } from '@/object-record/record-field/form-types/components/FormMultiSelectFieldInput';
 import { FieldMultiSelectValue } from '@/object-record/record-field/types/FieldMetadata';
+import { isFieldRelation } from '@/object-record/record-field/types/guards/isFieldRelation';
+import { shouldDisplayFormField } from '@/workflow/workflow-steps/workflow-actions/utils/shouldDisplayFormField';
 import { isDefined } from 'twenty-shared/utils';
 import { useIcons } from 'twenty-ui/display';
-import { shouldDisplayFormField } from '@/workflow/workflow-steps/workflow-actions/utils/shouldDisplayFormField';
+import { RelationType } from '~/generated-metadata/graphql';
 
 export const WorkflowFieldsMultiSelect = ({
   label,
@@ -50,12 +52,22 @@ export const WorkflowFieldsMultiSelect = ({
       testId="workflow-fields-multi-select"
       label={label}
       defaultValue={defaultFields}
-      options={inlineFieldDefinitions.map((field) => ({
+      options={inlineFieldDefinitions.map((field) => {
-        label: field.label,
+        const isFieldRelationManyToOne =
-        value: field.metadata.fieldName,
+          isFieldRelation(field) &&
-        icon: getIcon(field.iconName),
+          field.metadata.relationType === RelationType.MANY_TO_ONE;
-        color: 'gray',
+
-      }))}
+        const value = isFieldRelationManyToOne
+          ? `${field.metadata.fieldName}Id`
+          : field.metadata.fieldName;
+
+        return {
+          label: field.label,
+          value,
+          icon: getIcon(field.iconName),
+          color: 'gray',
+        };
+      })}
       onChange={handleFieldsChange}
       placeholder={placeholder}
       readonly={readonly}

packages/twenty-front/src/pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldConfigure.tsx

@@ -1,4 +1,3 @@
-import { useCreateOneRelationMetadataItem } from '@/object-metadata/hooks/useCreateOneRelationMetadataItem';
 import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
 import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
@@ -22,7 +21,6 @@ import { ViewType } from '@/views/types/ViewType';
 import { useApolloClient } from '@apollo/client';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useLingui } from '@lingui/react/macro';
-import pick from 'lodash.pick';
 import { useEffect, useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { useParams, useSearchParams } from 'react-router-dom';
@@ -33,7 +31,6 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { useNavigateApp } from '~/hooks/useNavigateApp';
 import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 import { DEFAULT_ICONS_BY_FIELD_TYPE } from '~/pages/settings/data-model/constants/DefaultIconsByFieldType';
-import { computeMetadataNameFromLabel } from '~/pages/settings/data-model/utils/compute-metadata-name-from-label.utils';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 import { getSettingsPath } from '~/utils/navigation/getSettingsPath';
 
@@ -119,8 +116,6 @@ export const SettingsObjectNewFieldConfigure = () => {
       setRelationObjectViews(views);
     },
   });
-  const { createOneRelationMetadataItem: createOneRelationMetadata } =
-    useCreateOneRelationMetadataItem();
 
   useEffect(() => {
     if (!activeObjectMetadataItem) {
@@ -146,27 +141,14 @@ export const SettingsObjectNewFieldConfigure = () => {
         'relation' in formValues
       ) {
         const { relation: relationFormValues, ...fieldFormValues } = formValues;
-
+        await createMetadataField({
-        await createOneRelationMetadata({
+          ...fieldFormValues,
-          relationType: relationFormValues.type,
-          field: pick(fieldFormValues, [
-            'icon',
-            'label',
-            'description',
-            'name',
-            'isLabelSyncedWithName',
-          ]),
           objectMetadataId: activeObjectMetadataItem.id,
-          connect: {
+          relationCreationPayload: {
-            field: {
+            type: relationFormValues.type,
-              icon: relationFormValues.field.icon,
+            targetObjectMetadataId: relationFormValues.objectMetadataId,
-              label: relationFormValues.field.label,
+            targetFieldLabel: relationFormValues.field.label,
-              name:
+            targetFieldIcon: relationFormValues.field.icon,
-                (relationFormValues.field.isLabelSyncedWithName ?? true)
-                  ? computeMetadataNameFromLabel(relationFormValues.field.label)
-                  : relationFormValues.field.name,
-            },
-            objectMetadataId: relationFormValues.objectMetadataId,
           },
         });
       } else {

packages/twenty-server/project.json

@@ -150,7 +150,6 @@
       "options": {
         "cwd": "packages/twenty-server",
         "commands": [
-          "nx typeorm -- migration:run -d src/database/typeorm/metadata/metadata.datasource",
           "nx typeorm -- migration:run -d src/database/typeorm/core/core.datasource"
         ]
       }
@@ -161,7 +160,6 @@
       "options": {
         "cwd": "packages/twenty-server",
         "commands": [
-          "nx typeorm -- migration:revert -d src/database/typeorm/metadata/metadata.datasource",
           "nx typeorm -- migration:revert -d src/database/typeorm/core/core.datasource"
         ]
       }

packages/twenty-server/scripts/setup-db.ts

@@ -11,10 +11,6 @@ rawDataSource
       'CREATE SCHEMA IF NOT EXISTS "public"',
       'create schema "public"',
     );
-    await performQuery(
-      'CREATE SCHEMA IF NOT EXISTS "metadata"',
-      'create schema "metadata"',
-    );
     await performQuery(
       'CREATE SCHEMA IF NOT EXISTS "core"',
       'create schema "core"',

packages/twenty-server/src/database/commands/data-seed-demo-workspace/data-seed-demo-workspace.module.ts

@@ -1,18 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { DataSeedDemoWorkspaceService } from 'src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service';
-import { TwentyConfigModule } from 'src/engine/core-modules/twenty-config/twenty-config.module';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
-
-@Module({
-  imports: [
-    WorkspaceManagerModule,
-    TwentyConfigModule,
-    TypeOrmModule.forFeature([Workspace], 'core'),
-  ],
-  providers: [DataSeedDemoWorkspaceService],
-  exports: [DataSeedDemoWorkspaceService],
-})
-export class DataSeedDemoWorkspaceModule {}

packages/twenty-server/src/database/commands/data-seed-demo-workspace/services/data-seed-demo-workspace.service.ts

@@ -1,64 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Repository } from 'typeorm';
-
-import { seedCoreSchema } from 'src/database/typeorm-seeds/core';
-import { deleteCoreSchema } from 'src/database/typeorm-seeds/core/demo';
-import { rawDataSource } from 'src/database/typeorm/raw/raw.datasource';
-import { InjectCacheStorage } from 'src/engine/core-modules/cache-storage/decorators/cache-storage.decorator';
-import { CacheStorageService } from 'src/engine/core-modules/cache-storage/services/cache-storage.service';
-import { CacheStorageNamespace } from 'src/engine/core-modules/cache-storage/types/cache-storage-namespace.enum';
-import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { WorkspaceManagerService } from 'src/engine/workspace-manager/workspace-manager.service';
-
-@Injectable()
-export class DataSeedDemoWorkspaceService {
-  constructor(
-    private readonly workspaceManagerService: WorkspaceManagerService,
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    @InjectCacheStorage(CacheStorageNamespace.EngineWorkspace)
-    private readonly workspaceSchemaCache: CacheStorageService,
-    private readonly twentyConfigService: TwentyConfigService,
-  ) {}
-
-  async seedDemo(): Promise<void> {
-    try {
-      await rawDataSource.initialize();
-
-      // TODO: migrate demo seeds to dev seeds
-      const demoWorkspaceIds = ['', ''];
-
-      await this.workspaceSchemaCache.flush();
-
-      for (const workspaceId of demoWorkspaceIds) {
-        const existingWorkspaces = await this.workspaceRepository.findBy({
-          id: workspaceId,
-        });
-
-        if (existingWorkspaces.length > 0) {
-          await this.workspaceManagerService.delete(workspaceId);
-          await deleteCoreSchema(rawDataSource, workspaceId);
-        }
-
-        const appVersion = this.twentyConfigService.get('APP_VERSION');
-
-        await seedCoreSchema({
-          dataSource: rawDataSource,
-          workspaceId,
-          appVersion,
-          seedBilling: false,
-          seedFeatureFlags: false,
-        });
-        await this.workspaceManagerService.initDemo(workspaceId);
-      }
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.error(error);
-
-      return;
-    }
-  }
-}

packages/twenty-server/src/database/commands/data-seed-dev-workspace.command.ts

@@ -1,54 +1,12 @@
 import { Logger } from '@nestjs/common';
 
 import { Command, CommandRunner } from 'nest-commander';
-import { DataSource } from 'typeorm';
 
-import { seedCoreSchema } from 'src/database/typeorm-seeds/core';
 import {
   SEED_ACME_WORKSPACE_ID,
   SEED_APPLE_WORKSPACE_ID,
-} from 'src/database/typeorm-seeds/core/workspaces';
+} from 'src/engine/workspace-manager/dev-seeder/core/utils/seed-workspaces.util';
-import {
+import { DevSeederService } from 'src/engine/workspace-manager/dev-seeder/services/dev-seeder.service';
-  getDevSeedCompanyCustomFields,
-  getDevSeedPeopleCustomFields,
-} from 'src/database/typeorm-seeds/metadata/fieldsMetadata';
-import { seedApiKey } from 'src/database/typeorm-seeds/workspace/api-key';
-import { seedCalendarChannels } from 'src/database/typeorm-seeds/workspace/calendar-channel';
-import { seedCalendarChannelEventAssociations } from 'src/database/typeorm-seeds/workspace/calendar-channel-event-association';
-import { seedCalendarEventParticipants } from 'src/database/typeorm-seeds/workspace/calendar-event-participants';
-import { seedCalendarEvents } from 'src/database/typeorm-seeds/workspace/calendar-events';
-import { seedCompanies } from 'src/database/typeorm-seeds/workspace/companies';
-import { seedConnectedAccount } from 'src/database/typeorm-seeds/workspace/connected-account';
-import { seedWorkspaceFavorites } from 'src/database/typeorm-seeds/workspace/favorites';
-import { seedMessageChannelMessageAssociation } from 'src/database/typeorm-seeds/workspace/message-channel-message-associations';
-import { seedMessageChannel } from 'src/database/typeorm-seeds/workspace/message-channels';
-import { seedMessageParticipant } from 'src/database/typeorm-seeds/workspace/message-participants';
-import { seedMessageThread } from 'src/database/typeorm-seeds/workspace/message-threads';
-import { seedMessage } from 'src/database/typeorm-seeds/workspace/messages';
-import { seedOpportunity } from 'src/database/typeorm-seeds/workspace/opportunities';
-import { seedPeople } from 'src/database/typeorm-seeds/workspace/seedPeople';
-import { seedWorkspaceMember } from 'src/database/typeorm-seeds/workspace/workspace-members';
-import { rawDataSource } from 'src/database/typeorm/raw/raw.datasource';
-import { TypeORMService } from 'src/database/typeorm/typeorm.service';
-import { TwentyConfigService } from 'src/engine/core-modules/twenty-config/twenty-config.service';
-import { DataSourceEntity } from 'src/engine/metadata-modules/data-source/data-source.entity';
-import { DataSourceService } from 'src/engine/metadata-modules/data-source/data-source.service';
-import { FieldMetadataService } from 'src/engine/metadata-modules/field-metadata/field-metadata.service';
-import { ObjectMetadataService } from 'src/engine/metadata-modules/object-metadata/object-metadata.service';
-import { PETS_DATA_SEEDS } from 'src/engine/seeder/data-seeds/pets-data-seeds';
-import { SURVEY_RESULTS_DATA_SEEDS } from 'src/engine/seeder/data-seeds/survey-results-data-seeds';
-import { PETS_METADATA_SEEDS } from 'src/engine/seeder/metadata-seeds/pets-metadata-seeds';
-import { SURVEY_RESULTS_METADATA_SEEDS } from 'src/engine/seeder/metadata-seeds/survey-results-metadata-seeds';
-import { SeederService } from 'src/engine/seeder/seeder.service';
-import { WorkspaceEntityManager } from 'src/engine/twenty-orm/entity-manager/workspace-entity-manager';
-import { shouldSeedWorkspaceFavorite } from 'src/engine/utils/should-seed-workspace-favorite';
-import { WorkspaceCacheStorageService } from 'src/engine/workspace-cache-storage/workspace-cache-storage.service';
-import { createWorkspaceViews } from 'src/engine/workspace-manager/standard-objects-prefill-data/create-workspace-views';
-import { seedViewWithDemoData } from 'src/engine/workspace-manager/standard-objects-prefill-data/seed-view-with-demo-data';
-import { opportunitiesTableByStageView } from 'src/engine/workspace-manager/standard-objects-prefill-data/views/opportunity-table-by-stage.view';
-import { WorkspaceManagerService } from 'src/engine/workspace-manager/workspace-manager.service';
-import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-// TODO: implement dry-run
 @Command({
   name: 'workspace:seed:dev',
   description:
@@ -58,265 +16,18 @@ export class DataSeedWorkspaceCommand extends CommandRunner {
   workspaceIds = [SEED_APPLE_WORKSPACE_ID, SEED_ACME_WORKSPACE_ID];
   private readonly logger = new Logger(DataSeedWorkspaceCommand.name);
 
-  constructor(
+  constructor(private readonly devSeederService: DevSeederService) {
-    private readonly dataSourceService: DataSourceService,
-    private readonly typeORMService: TypeORMService,
-    private readonly fieldMetadataService: FieldMetadataService,
-    private readonly objectMetadataService: ObjectMetadataService,
-    private readonly seederService: SeederService,
-    private readonly workspaceManagerService: WorkspaceManagerService,
-    private readonly twentyConfigService: TwentyConfigService,
-    private readonly workspaceCacheStorageService: WorkspaceCacheStorageService,
-  ) {
     super();
   }
 
   async run(): Promise<void> {
     try {
       for (const workspaceId of this.workspaceIds) {
-        await this.createWorkspaceSchema(workspaceId);
+        await this.devSeederService.seedDev(workspaceId);
       }
     } catch (error) {
       this.logger.error(error);
-
+      this.logger.error(error.stack);
-      return;
     }
-
-    for (const workspaceId of this.workspaceIds) {
-      await this.seedWorkspace(workspaceId);
-    }
-  }
-
-  async createWorkspaceSchema(workspaceId: string) {
-    const workspaceCachedMetadataVersion =
-      await this.workspaceCacheStorageService.getMetadataVersion(workspaceId);
-
-    await this.workspaceCacheStorageService.flush(
-      workspaceId,
-      workspaceCachedMetadataVersion,
-    );
-
-    await rawDataSource.initialize();
-
-    const isBillingEnabled = this.twentyConfigService.get('IS_BILLING_ENABLED');
-    const appVersion = this.twentyConfigService.get('APP_VERSION');
-
-    await seedCoreSchema({
-      dataSource: rawDataSource,
-      workspaceId,
-      seedBilling: isBillingEnabled,
-      appVersion,
-    });
-
-    await rawDataSource.destroy();
-
-    await this.workspaceManagerService.initDev(workspaceId);
-  }
-
-  async seedWorkspace(workspaceId: string) {
-    const dataSourceMetadata =
-      await this.dataSourceService.getLastDataSourceMetadataFromWorkspaceIdOrFail(
-        workspaceId,
-      );
-
-    const mainDataSource = this.typeORMService.getMainDataSource();
-
-    if (!mainDataSource) {
-      throw new Error('Could not connect to workspace data source');
-    }
-
-    try {
-      const { objectMetadataStandardIdToIdMap } =
-        await this.objectMetadataService.getObjectMetadataStandardIdToIdMap(
-          workspaceId,
-        );
-
-      await this.seedCompanyCustomFields(
-        objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.company].id,
-        workspaceId,
-      );
-
-      await this.seedPeopleCustomFields(
-        objectMetadataStandardIdToIdMap[STANDARD_OBJECT_IDS.person].id,
-        workspaceId,
-      );
-
-      await this.seedCustomObjects({
-        dataSourceMetadata,
-      });
-
-      await this.seedRecords({
-        mainDataSource,
-        dataSourceMetadata,
-      });
-    } catch (error) {
-      this.logger.error(error);
-    }
-  }
-
-  async seedCustomObjects({
-    dataSourceMetadata,
-  }: {
-    dataSourceMetadata: DataSourceEntity;
-  }) {
-    await this.seederService.seedCustomObjects(
-      dataSourceMetadata.id,
-      dataSourceMetadata.workspaceId,
-      PETS_METADATA_SEEDS,
-    );
-
-    await this.seederService.seedCustomObjects(
-      dataSourceMetadata.id,
-      dataSourceMetadata.workspaceId,
-      SURVEY_RESULTS_METADATA_SEEDS,
-    );
-  }
-
-  async seedRecords({
-    mainDataSource,
-    dataSourceMetadata,
-  }: {
-    mainDataSource: DataSource;
-    dataSourceMetadata: DataSourceEntity;
-  }) {
-    await this.seedStandardObjectRecords(mainDataSource, dataSourceMetadata);
-
-    await this.seederService.seedCustomObjectRecords(
-      dataSourceMetadata.workspaceId,
-      PETS_METADATA_SEEDS,
-      PETS_DATA_SEEDS,
-    );
-
-    await this.seederService.seedCustomObjectRecords(
-      dataSourceMetadata.workspaceId,
-      SURVEY_RESULTS_METADATA_SEEDS,
-      SURVEY_RESULTS_DATA_SEEDS,
-    );
-  }
-
-  async seedStandardObjectRecords(
-    mainDataSource: DataSource,
-    dataSourceMetadata: DataSourceEntity,
-  ) {
-    await mainDataSource.transaction(
-      async (entityManager: WorkspaceEntityManager) => {
-        const { objectMetadataStandardIdToIdMap } =
-          await this.objectMetadataService.getObjectMetadataStandardIdToIdMap(
-            dataSourceMetadata.workspaceId,
-          );
-
-        await seedCompanies(entityManager, dataSourceMetadata.schema);
-        await seedPeople(entityManager, dataSourceMetadata.schema);
-        await seedOpportunity(entityManager, dataSourceMetadata.schema);
-        await seedWorkspaceMember(
-          entityManager,
-          dataSourceMetadata.schema,
-          dataSourceMetadata.workspaceId,
-        );
-
-        if (dataSourceMetadata.workspaceId === SEED_APPLE_WORKSPACE_ID) {
-          await seedApiKey(entityManager, dataSourceMetadata.schema);
-          await seedMessageThread(entityManager, dataSourceMetadata.schema);
-          await seedConnectedAccount(entityManager, dataSourceMetadata.schema);
-
-          await seedMessage(entityManager, dataSourceMetadata.schema);
-          await seedMessageChannel(entityManager, dataSourceMetadata.schema);
-          await seedMessageChannelMessageAssociation(
-            entityManager,
-            dataSourceMetadata.schema,
-          );
-          await seedMessageParticipant(
-            entityManager,
-            dataSourceMetadata.schema,
-          );
-
-          await seedCalendarEvents(entityManager, dataSourceMetadata.schema);
-          await seedCalendarChannels(entityManager, dataSourceMetadata.schema);
-          await seedCalendarChannelEventAssociations(
-            entityManager,
-            dataSourceMetadata.schema,
-          );
-          await seedCalendarEventParticipants(
-            entityManager,
-            dataSourceMetadata.schema,
-          );
-        }
-
-        const viewDefinitionsWithId = await seedViewWithDemoData(
-          entityManager,
-          dataSourceMetadata.schema,
-          objectMetadataStandardIdToIdMap,
-        );
-
-        const devViewDefinitionsWithId = await createWorkspaceViews(
-          entityManager,
-          dataSourceMetadata.schema,
-          [opportunitiesTableByStageView(objectMetadataStandardIdToIdMap)],
-        );
-
-        viewDefinitionsWithId.push(...devViewDefinitionsWithId);
-
-        await seedWorkspaceFavorites(
-          viewDefinitionsWithId
-            .filter(
-              (view) =>
-                view.key === 'INDEX' &&
-                shouldSeedWorkspaceFavorite(
-                  view.objectMetadataId,
-                  objectMetadataStandardIdToIdMap,
-                ),
-            )
-            .map((view) => view.id),
-          entityManager,
-          dataSourceMetadata.schema,
-        );
-      },
-    );
-  }
-
-  async seedCompanyCustomFields(
-    companyObjectMetadataId: string,
-    workspaceId: string,
-  ) {
-    if (!companyObjectMetadataId) {
-      throw new Error(
-        `Company object metadata not found for workspace ${workspaceId}, can't seed custom fields`,
-      );
-    }
-
-    const DEV_SEED_COMPANY_CUSTOM_FIELDS = getDevSeedCompanyCustomFields(
-      companyObjectMetadataId,
-      workspaceId,
-    );
-
-    await this.fieldMetadataService.createMany(
-      DEV_SEED_COMPANY_CUSTOM_FIELDS.map((customField) => ({
-        ...customField,
-        isCustom: true,
-      })),
-    );
-  }
-
-  async seedPeopleCustomFields(
-    personObjectMetadataId: string,
-    workspaceId: string,
-  ) {
-    if (!personObjectMetadataId) {
-      throw new Error(
-        `Person object metadata not found for workspace ${workspaceId}, can't seed custom fields`,
-      );
-    }
-
-    const DEV_SEED_PERSON_CUSTOM_FIELDS = getDevSeedPeopleCustomFields(
-      personObjectMetadataId,
-      workspaceId,
-    );
-
-    await this.fieldMetadataService.createMany(
-      DEV_SEED_PERSON_CUSTOM_FIELDS.map((customField) => ({
-        ...customField,
-        isCustom: true,
-      })),
-    );
   }
 }

packages/twenty-server/src/database/commands/database-command.module.ts

@@ -7,8 +7,8 @@ import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
 import { DataSourceModule } from 'src/engine/metadata-modules/data-source/data-source.module';
 import { FieldMetadataModule } from 'src/engine/metadata-modules/field-metadata/field-metadata.module';
 import { ObjectMetadataModule } from 'src/engine/metadata-modules/object-metadata/object-metadata.module';
-import { SeederModule } from 'src/engine/seeder/seeder.module';
 import { WorkspaceCacheStorageModule } from 'src/engine/workspace-cache-storage/workspace-cache-storage.module';
+import { DevSeederModule } from 'src/engine/workspace-manager/dev-seeder/dev-seeder.module';
 import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-manager.module';
 
 @Module({
@@ -19,7 +19,7 @@ import { WorkspaceManagerModule } from 'src/engine/workspace-manager/workspace-m
     TypeORMModule,
     FieldMetadataModule,
     ObjectMetadataModule,
-    SeederModule,
+    DevSeederModule,
     WorkspaceManagerModule,
     DataSourceModule,
     WorkspaceCacheStorageModule,

packages/twenty-server/src/database/commands/upgrade-version-command/0-44/0-44-initialize-permissions.command.ts

@@ -1,232 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import chalk from 'chalk';
-import { Command } from 'nest-commander';
-import { Repository } from 'typeorm';
-import { isDefined } from 'twenty-shared/utils';
-
-import {
-  ActiveOrSuspendedWorkspacesMigrationCommandOptions,
-  ActiveOrSuspendedWorkspacesMigrationCommandRunner,
-  RunOnWorkspaceArgs,
-} from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
-import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { ADMIN_ROLE_LABEL } from 'src/engine/metadata-modules/permissions/constants/admin-role-label.constants';
-import { MEMBER_ROLE_LABEL } from 'src/engine/metadata-modules/permissions/constants/member-role-label.constants';
-import { RoleService } from 'src/engine/metadata-modules/role/role.service';
-import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-
-@Command({
-  name: 'upgrade:0-44:initialize-permissions',
-  description: 'Initialize permissions',
-})
-export class InitializePermissionsCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    @InjectRepository(UserWorkspace, 'core')
-    protected readonly userWorkspaceRepository: Repository<UserWorkspace>,
-    protected readonly twentyORMGlobalManager: TwentyORMGlobalManager,
-    private readonly roleService: RoleService,
-    private readonly userRoleService: UserRoleService,
-  ) {
-    super(workspaceRepository, twentyORMGlobalManager);
-  }
-
-  override async runOnWorkspace({
-    index,
-    total,
-    workspaceId,
-    options,
-  }: RunOnWorkspaceArgs): Promise<void> {
-    try {
-      this.logger.log(
-        `Running command for workspace ${workspaceId} ${index + 1}/${total}`,
-      );
-
-      let adminRoleId: string | undefined;
-
-      const workspaceRoles =
-        await this.roleService.getWorkspaceRoles(workspaceId);
-
-      adminRoleId = workspaceRoles.find(
-        (role) => role.label === ADMIN_ROLE_LABEL,
-      )?.id;
-
-      if (!isDefined(adminRoleId)) {
-        adminRoleId = await this.createAdminRole({
-          workspaceId,
-          options,
-        });
-      }
-
-      await this.assignAdminRoleToMembers({
-        workspaceId,
-        adminRoleId,
-        options,
-      });
-
-      await this.setAdminRoleAsDefaultRole({
-        workspaceId,
-        adminRoleId,
-        options,
-      });
-
-      const memberRole = workspaceRoles.find(
-        (role) => role.label === MEMBER_ROLE_LABEL,
-      );
-
-      if (!isDefined(memberRole)) {
-        await this.createMemberRole({
-          workspaceId,
-          options,
-        });
-      }
-    } catch (error) {
-      this.logger.log(
-        chalk.red(`Error in workspace ${workspaceId} - ${error.message}`),
-      );
-    }
-  }
-
-  private async createAdminRole({
-    workspaceId,
-    options,
-  }: {
-    workspaceId: string;
-    options: ActiveOrSuspendedWorkspacesMigrationCommandOptions;
-  }) {
-    this.logger.log(
-      chalk.green(`Creating admin role ${options.dryRun ? '(dry run)' : ''}`),
-    );
-
-    if (options.dryRun) {
-      return '';
-    }
-
-    const adminRole = await this.roleService.createAdminRole({
-      workspaceId,
-    });
-
-    return adminRole.id;
-  }
-
-  private async createMemberRole({
-    workspaceId,
-    options,
-  }: {
-    workspaceId: string;
-    options: ActiveOrSuspendedWorkspacesMigrationCommandOptions;
-  }) {
-    this.logger.log(
-      chalk.green(`Creating member role ${options.dryRun ? '(dry run)' : ''}`),
-    );
-
-    if (options.dryRun) {
-      return '';
-    }
-
-    const memberRole = await this.roleService.createMemberRole({
-      workspaceId,
-    });
-
-    return memberRole.id;
-  }
-
-  private async setAdminRoleAsDefaultRole({
-    workspaceId,
-    adminRoleId,
-    options,
-  }: {
-    workspaceId: string;
-    adminRoleId: string;
-    options: ActiveOrSuspendedWorkspacesMigrationCommandOptions;
-  }) {
-    const workspaceDefaultRole = await this.workspaceRepository.findOne({
-      where: {
-        id: workspaceId,
-      },
-    });
-
-    if (isDefined(workspaceDefaultRole?.defaultRoleId)) {
-      this.logger.log(
-        chalk.green(
-          'Workspace already has a default role. Skipping setting admin role as default role',
-        ),
-      );
-
-      return;
-    }
-
-    this.logger.log(
-      chalk.green(
-        `Setting admin role as default role ${options.dryRun ? '(dry run)' : ''}`,
-      ),
-    );
-
-    if (options.dryRun) {
-      return;
-    }
-
-    await this.workspaceRepository.update(workspaceId, {
-      defaultRoleId: adminRoleId,
-    });
-  }
-
-  private async assignAdminRoleToMembers({
-    workspaceId,
-    adminRoleId,
-    options,
-  }: {
-    workspaceId: string;
-    adminRoleId: string;
-    options: ActiveOrSuspendedWorkspacesMigrationCommandOptions;
-  }) {
-    const userWorkspaces = await this.userWorkspaceRepository.find({
-      where: {
-        workspaceId,
-      },
-    });
-
-    const rolesByUserWorkspace =
-      await this.userRoleService.getRolesByUserWorkspaces({
-        userWorkspaceIds: userWorkspaces.map(
-          (userWorkspace) => userWorkspace.id,
-        ),
-        workspaceId,
-      });
-
-    for (const userWorkspace of userWorkspaces) {
-      if (
-        rolesByUserWorkspace
-          .get(userWorkspace.id)
-          ?.some((role) => isDefined(role))
-      ) {
-        this.logger.log(
-          chalk.green(
-            `User workspace ${userWorkspace.id} already has a role. Skipping role assignation`,
-          ),
-        );
-        continue;
-      }
-
-      this.logger.log(
-        chalk.green(
-          `Assigning admin role to workspace member ${userWorkspace.id} ${options.dryRun ? '(dry run)' : ''}`,
-        ),
-      );
-
-      if (options.dryRun) {
-        continue;
-      }
-
-      await this.userRoleService.assignRoleToUserWorkspace({
-        roleId: adminRoleId,
-        userWorkspaceId: userWorkspace.id,
-        workspaceId,
-      });
-    }
-  }
-}

packages/twenty-server/src/database/commands/upgrade-version-command/0-44/0-44-update-view-aggregate-operations.command.ts

@@ -1,272 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import chalk from 'chalk';
-import { Command } from 'nest-commander';
-import { Repository } from 'typeorm';
-
-import {
-  ActiveOrSuspendedWorkspacesMigrationCommandRunner,
-  RunOnWorkspaceArgs,
-} from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
-import { AggregateOperations } from 'src/engine/api/graphql/graphql-query-runner/constants/aggregate-operations.constant';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { WorkspaceMetadataVersionService } from 'src/engine/metadata-modules/workspace-metadata-version/services/workspace-metadata-version.service';
-import { generateMigrationName } from 'src/engine/metadata-modules/workspace-migration/utils/generate-migration-name.util';
-import {
-  WorkspaceMigrationColumnActionType,
-  WorkspaceMigrationTableAction,
-  WorkspaceMigrationTableActionType,
-} from 'src/engine/metadata-modules/workspace-migration/workspace-migration.entity';
-import { WorkspaceMigrationFactory } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.factory';
-import { WorkspaceMigrationService } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.service';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-import { computeObjectTargetTable } from 'src/engine/utils/compute-object-target-table.util';
-import { WorkspaceMigrationRunnerService } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.service';
-import { STANDARD_OBJECT_IDS } from 'src/engine/workspace-manager/workspace-sync-metadata/constants/standard-object-ids';
-
-const AGGREGATE_OPERATION_OPTIONS = [
-  {
-    value: AggregateOperations.AVG,
-    label: 'Average',
-    position: 0,
-    color: 'red',
-  },
-  {
-    value: AggregateOperations.COUNT,
-    label: 'Count',
-    position: 1,
-    color: 'purple',
-  },
-  {
-    value: AggregateOperations.MAX,
-    label: 'Maximum',
-    position: 2,
-    color: 'sky',
-  },
-  {
-    value: AggregateOperations.MIN,
-    label: 'Minimum',
-    position: 3,
-    color: 'turquoise',
-  },
-  {
-    value: AggregateOperations.SUM,
-    label: 'Sum',
-    position: 4,
-    color: 'yellow',
-  },
-  {
-    value: AggregateOperations.COUNT_EMPTY,
-    label: 'Count empty',
-    position: 5,
-    color: 'red',
-  },
-  {
-    value: AggregateOperations.COUNT_NOT_EMPTY,
-    label: 'Count not empty',
-    position: 6,
-    color: 'purple',
-  },
-  {
-    value: AggregateOperations.COUNT_UNIQUE_VALUES,
-    label: 'Count unique values',
-    position: 7,
-    color: 'sky',
-  },
-  {
-    value: AggregateOperations.PERCENTAGE_EMPTY,
-    label: 'Percent empty',
-    position: 8,
-    color: 'turquoise',
-  },
-  {
-    value: AggregateOperations.PERCENTAGE_NOT_EMPTY,
-    label: 'Percent not empty',
-    position: 9,
-    color: 'yellow',
-  },
-  {
-    value: AggregateOperations.COUNT_TRUE,
-    label: 'Count true',
-    position: 10,
-    color: 'red',
-  },
-  {
-    value: AggregateOperations.COUNT_FALSE,
-    label: 'Count false',
-    position: 11,
-    color: 'purple',
-  },
-];
-
-@Command({
-  name: 'upgrade:0-44:update-view-aggregate-operations',
-  description:
-    'Update View and ViewField entities with new aggregate operations (countTrue, countFalse)',
-})
-export class UpdateViewAggregateOperationsCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    @InjectRepository(ObjectMetadataEntity, 'metadata')
-    private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
-    @InjectRepository(FieldMetadataEntity, 'metadata')
-    private readonly fieldMetadataRepository: Repository<FieldMetadataEntity>,
-    protected readonly twentyORMGlobalManager: TwentyORMGlobalManager,
-    private readonly workspaceMetadataVersionService: WorkspaceMetadataVersionService,
-    private readonly workspaceMigrationService: WorkspaceMigrationService,
-    private readonly workspaceMigrationRunnerService: WorkspaceMigrationRunnerService,
-    private readonly workspaceMigrationFactory: WorkspaceMigrationFactory,
-  ) {
-    super(workspaceRepository, twentyORMGlobalManager);
-  }
-
-  override async runOnWorkspace({
-    index,
-    total,
-    workspaceId,
-  }: RunOnWorkspaceArgs): Promise<void> {
-    this.logger.log(
-      `Running command for workspace ${workspaceId} ${index + 1}/${total}`,
-    );
-
-    await this.updateViewAggregateOperations(workspaceId);
-    await this.updateViewFieldAggregateOperations(workspaceId);
-
-    await this.workspaceMigrationRunnerService.executeMigrationFromPendingMigrations(
-      workspaceId,
-    );
-
-    await this.workspaceMetadataVersionService.incrementMetadataVersion(
-      workspaceId,
-    );
-
-    this.logger.log(
-      chalk.green(`Command completed for workspace ${workspaceId}.`),
-    );
-  }
-
-  private async updateViewAggregateOperations(
-    workspaceId: string,
-  ): Promise<void> {
-    const viewObjectMetadata = await this.objectMetadataRepository.findOne({
-      where: {
-        workspaceId,
-        standardId: STANDARD_OBJECT_IDS.view,
-      },
-      relations: ['fields'],
-    });
-
-    if (!viewObjectMetadata) {
-      this.logger.warn(
-        `View object metadata not found for workspace ${workspaceId}`,
-      );
-
-      return;
-    }
-
-    const kanbanAggregateOperationField = viewObjectMetadata.fields.find(
-      (field) => field.name === 'kanbanAggregateOperation',
-    );
-
-    if (!kanbanAggregateOperationField) {
-      this.logger.warn(
-        `kanbanAggregateOperation field not found for workspace ${workspaceId}`,
-      );
-
-      return;
-    }
-
-    await this.fieldMetadataRepository.update(
-      { id: kanbanAggregateOperationField.id },
-      { options: AGGREGATE_OPERATION_OPTIONS },
-    );
-
-    this.logger.log(
-      `Updated kanbanAggregateOperation options for workspace ${workspaceId}`,
-    );
-
-    await this.workspaceMigrationService.createCustomMigration(
-      generateMigrationName(`update-view-operations`),
-      workspaceId,
-      [
-        {
-          name: computeObjectTargetTable(viewObjectMetadata),
-          action: WorkspaceMigrationTableActionType.ALTER,
-          columns: this.workspaceMigrationFactory.createColumnActions(
-            WorkspaceMigrationColumnActionType.ALTER,
-            { ...kanbanAggregateOperationField, options: undefined },
-            {
-              ...kanbanAggregateOperationField,
-              options: AGGREGATE_OPERATION_OPTIONS,
-            },
-          ),
-        } satisfies WorkspaceMigrationTableAction,
-      ],
-    );
-  }
-
-  private async updateViewFieldAggregateOperations(
-    workspaceId: string,
-  ): Promise<void> {
-    const viewFieldObjectMetadata = await this.objectMetadataRepository.findOne(
-      {
-        where: {
-          workspaceId,
-          standardId: STANDARD_OBJECT_IDS.viewField,
-        },
-        relations: ['fields'],
-      },
-    );
-
-    if (!viewFieldObjectMetadata) {
-      this.logger.warn(
-        `ViewField object metadata not found for workspace ${workspaceId}`,
-      );
-
-      return;
-    }
-
-    const aggregateOperationField = viewFieldObjectMetadata.fields.find(
-      (field) => field.name === 'aggregateOperation',
-    );
-
-    if (!aggregateOperationField) {
-      this.logger.warn(
-        `aggregateOperation field not found for workspace ${workspaceId}`,
-      );
-
-      return;
-    }
-
-    await this.fieldMetadataRepository.update(
-      { id: aggregateOperationField.id },
-      { options: AGGREGATE_OPERATION_OPTIONS },
-    );
-
-    this.logger.log(
-      `Updated aggregateOperation options for workspace ${workspaceId}`,
-    );
-
-    await this.workspaceMigrationService.createCustomMigration(
-      generateMigrationName(`update-view-field-operations`),
-      workspaceId,
-      [
-        {
-          name: computeObjectTargetTable(viewFieldObjectMetadata),
-          action: WorkspaceMigrationTableActionType.ALTER,
-          columns: this.workspaceMigrationFactory.createColumnActions(
-            WorkspaceMigrationColumnActionType.ALTER,
-            { ...aggregateOperationField, options: undefined },
-            {
-              ...aggregateOperationField,
-              options: AGGREGATE_OPERATION_OPTIONS,
-            },
-          ),
-        } satisfies WorkspaceMigrationTableAction,
-      ],
-    );
-  }
-}

packages/twenty-server/src/database/commands/upgrade-version-command/0-44/0-44-upgrade-version-command.module.ts

@@ -1,37 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { InitializePermissionsCommand } from 'src/database/commands/upgrade-version-command/0-44/0-44-initialize-permissions.command';
-import { UpdateViewAggregateOperationsCommand } from 'src/database/commands/upgrade-version-command/0-44/0-44-update-view-aggregate-operations.command';
-import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { RoleModule } from 'src/engine/metadata-modules/role/role.module';
-import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';
-import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
-import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
-import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
-import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([Workspace, UserWorkspace], 'core'),
-    TypeOrmModule.forFeature(
-      [FieldMetadataEntity, ObjectMetadataEntity],
-      'metadata',
-    ),
-    WorkspaceDataSourceModule,
-    RoleModule,
-    UserRoleModule,
-    WorkspaceMigrationModule,
-    WorkspaceMigrationRunnerModule,
-    WorkspaceMetadataVersionModule,
-  ],
-  providers: [
-    InitializePermissionsCommand,
-    UpdateViewAggregateOperationsCommand,
-  ],
-  exports: [InitializePermissionsCommand, UpdateViewAggregateOperationsCommand],
-})
-export class V0_44_UpgradeVersionCommandModule {}

packages/twenty-server/src/database/commands/upgrade-version-command/0-50/0-50-upgrade-version-command.module.ts

@@ -1,32 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { RoleModule } from 'src/engine/metadata-modules/role/role.module';
-import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';
-import { WorkspaceMetadataVersionModule } from 'src/engine/metadata-modules/workspace-metadata-version/workspace-metadata-version.module';
-import { WorkspaceMigrationModule } from 'src/engine/metadata-modules/workspace-migration/workspace-migration.module';
-import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
-import { WorkspaceMigrationRunnerModule } from 'src/engine/workspace-manager/workspace-migration-runner/workspace-migration-runner.module';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([Workspace, UserWorkspace], 'core'),
-    TypeOrmModule.forFeature(
-      [FieldMetadataEntity, ObjectMetadataEntity],
-      'metadata',
-    ),
-    WorkspaceDataSourceModule,
-    RoleModule,
-    UserRoleModule,
-    WorkspaceMigrationModule,
-    WorkspaceMigrationRunnerModule,
-    WorkspaceMetadataVersionModule,
-  ],
-  providers: [],
-  exports: [],
-})
-export class V0_50_UpgradeVersionCommandModule {}

packages/twenty-server/src/database/commands/upgrade-version-command/0-51/0-51-update-workflow-trigger-type-enum.command.ts

@@ -1,112 +0,0 @@
-import { InjectRepository } from '@nestjs/typeorm';
-
-import { Command } from 'nest-commander';
-import { isDefined } from 'twenty-shared/utils';
-import { Repository } from 'typeorm';
-
-import {
-  ActiveOrSuspendedWorkspacesMigrationCommandRunner,
-  RunOnWorkspaceArgs,
-} from 'src/database/commands/command-runners/active-or-suspended-workspaces-migration.command-runner';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-import { computeTableName } from 'src/engine/utils/compute-table-name.util';
-import { WorkspaceDataSourceService } from 'src/engine/workspace-datasource/workspace-datasource.service';
-
-@Command({
-  name: 'upgrade:0-51:upgrade-created-by-enum',
-  description: 'Upgrade created by enum',
-})
-export class UpgradeCreatedByEnumCommand extends ActiveOrSuspendedWorkspacesMigrationCommandRunner {
-  constructor(
-    @InjectRepository(Workspace, 'core')
-    protected readonly workspaceRepository: Repository<Workspace>,
-    @InjectRepository(ObjectMetadataEntity, 'metadata')
-    private readonly objectMetadataRepository: Repository<ObjectMetadataEntity>,
-    protected readonly twentyORMGlobalManager: TwentyORMGlobalManager,
-    private readonly workspaceDataSourceService: WorkspaceDataSourceService,
-  ) {
-    super(workspaceRepository, twentyORMGlobalManager);
-  }
-
-  override async runOnWorkspace({
-    index,
-    total,
-    workspaceId,
-  }: RunOnWorkspaceArgs): Promise<void> {
-    this.logger.log(
-      `Running command for workspace ${workspaceId} ${index + 1}/${total}`,
-    );
-
-    const schemaName =
-      this.workspaceDataSourceService.getSchemaName(workspaceId);
-
-    const workspaceDataSource =
-      await this.twentyORMGlobalManager.getDataSourceForWorkspace({
-        workspaceId,
-      });
-
-    const objectMetadatas = await this.objectMetadataRepository.find({
-      where: {
-        workspaceId,
-      },
-      relations: ['fields'],
-    });
-
-    const queryRunner = workspaceDataSource?.createQueryRunner();
-
-    await queryRunner.connect();
-    await queryRunner.startTransaction();
-
-    try {
-      for (const objectMetadata of objectMetadatas) {
-        if (
-          !isDefined(
-            objectMetadata.fields.find((field) => field.name === 'createdBy'),
-          )
-        ) {
-          continue;
-        }
-
-        const tableToUpdate = computeTableName(
-          objectMetadata.nameSingular,
-          objectMetadata.isCustom,
-        );
-
-        // Set current column as text
-        await queryRunner.query(
-          `ALTER TABLE "${schemaName}"."${tableToUpdate}"
-          ALTER COLUMN "createdBySource" SET DATA TYPE text USING "createdBySource"::text`,
-        );
-
-        // Drop default value
-        await queryRunner.query(
-          `ALTER TABLE "${schemaName}"."${tableToUpdate}"
-          ALTER COLUMN "createdBySource" DROP DEFAULT`,
-        );
-
-        // Drop the old enum type
-        await queryRunner.query(
-          `DROP TYPE "${schemaName}"."${tableToUpdate}_createdBySource_enum"`,
-        );
-
-        await queryRunner.query(
-          `CREATE TYPE "${schemaName}"."${tableToUpdate}_createdBySource_enum" AS ENUM ('EMAIL', 'CALENDAR', 'WORKFLOW', 'API', 'IMPORT', 'MANUAL', 'SYSTEM', 'WEBHOOK')`,
-        );
-
-        // Re-apply the enum type
-        await queryRunner.query(
-          `ALTER TABLE "${schemaName}"."${tableToUpdate}"
-            ALTER COLUMN "createdBySource" SET DATA TYPE "${schemaName}"."${tableToUpdate}_createdBySource_enum" USING "createdBySource"::"${schemaName}"."${tableToUpdate}_createdBySource_enum"`,
-        );
-      }
-      await queryRunner.commitTransaction();
-    } catch (error) {
-      await queryRunner.rollbackTransaction();
-      throw error;
-    } finally {
-      await queryRunner.release();
-    }
-  }
-}

packages/twenty-server/src/database/commands/upgrade-version-command/0-51/0-51-upgrade-version-command.module.ts

@@ -1,22 +0,0 @@
-import { Module } from '@nestjs/common';
-import { TypeOrmModule } from '@nestjs/typeorm';
-
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity';
-import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/workspace-datasource.module';
-import { UpgradeCreatedByEnumCommand } from 'src/database/commands/upgrade-version-command/0-51/0-51-update-workflow-trigger-type-enum.command';
-import { FieldMetadataEntity } from 'src/engine/metadata-modules/field-metadata/field-metadata.entity';
-
-@Module({
-  imports: [
-    TypeOrmModule.forFeature([Workspace], 'core'),
-    TypeOrmModule.forFeature(
-      [ObjectMetadataEntity, FieldMetadataEntity],
-      'metadata',
-    ),
-    WorkspaceDataSourceModule,
-  ],
-  providers: [UpgradeCreatedByEnumCommand],
-  exports: [UpgradeCreatedByEnumCommand],
-})
-export class V0_51_UpgradeVersionCommandModule {}