Remove connected account feature flag (#19286)

Co-authored-by: martmull <martmull@hotmail.fr>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions <github-actions@twenty.com>
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-authored-by: Charles Bochet <charles@twenty.com>

packages/twenty-server/src/engine/workspace-manager/dev-seeder/core/utils/seed-metadata-entities.util.ts

@@ -24,6 +24,84 @@ type SeedMetadataEntitiesArgs = {
   workspaceId: string;
 };
 
+// YC workspace needs its own entity IDs since core tables have a single PK
+const YC_CONNECTED_ACCOUNT_IDS = {
+  TIM: '30303030-9ac0-4390-9a1a-ab4d2c4e1bb7',
+  JONY: '30303030-0cc8-4d60-a3a4-803245698908',
+  PHIL: '30303030-cafc-4323-908d-e5b42ad69fdf',
+  JANE: '30303030-b5c7-46f0-bf5c-3f4e4b3f7c1a',
+  JANE_DELETABLE: '30303030-d1e5-4a8f-9c3b-7f6d5e4c3b2a',
+};
+
+const YC_MESSAGE_CHANNEL_IDS = {
+  TIM: '30303030-9b80-4c2c-a597-383db48de1d6',
+  JONY: '30303030-5ffe-4b32-814a-983d5e4911cd',
+  PHIL: '30303030-e2f1-49b5-85d2-5d3a3386990c',
+  JANE: '30303030-8c4d-4e71-a672-2e6a8c9f1b3d',
+  SUPPORT: '30303030-e2f1-49b5-85d2-5d3a3386990d',
+  SALES: '30303030-e2f1-49b5-85d2-5d3a3386990e',
+};
+
+const YC_CALENDAR_CHANNEL_IDS = {
+  TIM: '30303030-a40f-4faf-bb9f-c6f9945b8203',
+  JONY: '30303030-a40f-4faf-bb9f-c6f9945b8204',
+  PHIL: '30303030-a40f-4faf-bb9f-c6f9945b8205',
+  JANE: '30303030-a40f-4faf-bb9f-c6f9945b8208',
+  COMPANY_MAIN: '30303030-a40f-4faf-bb9f-c6f9945b8206',
+  TEAM_CALENDAR: '30303030-a40f-4faf-bb9f-c6f9945b8207',
+};
+
+const YC_MESSAGE_FOLDER_IDS = {
+  TIM_INBOX: '30303030-1234-4567-8901-abcdef012345',
+  TIM_SENT: '30303030-1234-4567-8901-abcdef012349',
+  JONY_INBOX: '30303030-1234-4567-8901-abcdef012346',
+  JANE_INBOX: '30303030-1234-4567-8901-abcdef012347',
+  JANE_SENT: '30303030-1234-4567-8901-abcdef012348',
+};
+
+type WorkspaceSeedIds = {
+  userWorkspaceIds: {
+    TIM: string;
+    JONY: string;
+    PHIL: string;
+    JANE: string;
+  };
+  connectedAccountIds: typeof CONNECTED_ACCOUNT_DATA_SEED_IDS;
+  messageChannelIds: typeof MESSAGE_CHANNEL_DATA_SEED_IDS;
+  calendarChannelIds: typeof CALENDAR_CHANNEL_DATA_SEED_IDS;
+  messageFolderIds: typeof MESSAGE_FOLDER_DATA_SEED_IDS;
+};
+
+const getSeedIds = (workspaceId: string): WorkspaceSeedIds => {
+  if (workspaceId === SEED_YCOMBINATOR_WORKSPACE_ID) {
+    return {
+      userWorkspaceIds: {
+        TIM: USER_WORKSPACE_DATA_SEED_IDS.TIM_ACME,
+        JONY: USER_WORKSPACE_DATA_SEED_IDS.JONY_ACME,
+        PHIL: USER_WORKSPACE_DATA_SEED_IDS.PHIL_ACME,
+        JANE: USER_WORKSPACE_DATA_SEED_IDS.JANE_ACME,
+      },
+      connectedAccountIds: YC_CONNECTED_ACCOUNT_IDS,
+      messageChannelIds: YC_MESSAGE_CHANNEL_IDS,
+      calendarChannelIds: YC_CALENDAR_CHANNEL_IDS,
+      messageFolderIds: YC_MESSAGE_FOLDER_IDS,
+    };
+  }
+
+  return {
+    userWorkspaceIds: {
+      TIM: USER_WORKSPACE_DATA_SEED_IDS.TIM,
+      JONY: USER_WORKSPACE_DATA_SEED_IDS.JONY,
+      PHIL: USER_WORKSPACE_DATA_SEED_IDS.PHIL,
+      JANE: USER_WORKSPACE_DATA_SEED_IDS.JANE,
+    },
+    connectedAccountIds: CONNECTED_ACCOUNT_DATA_SEED_IDS,
+    messageChannelIds: MESSAGE_CHANNEL_DATA_SEED_IDS,
+    calendarChannelIds: CALENDAR_CHANNEL_DATA_SEED_IDS,
+    messageFolderIds: MESSAGE_FOLDER_DATA_SEED_IDS,
+  };
+};
+
 export const seedMetadataEntities = async ({
   queryRunner,
   schemaName,
@@ -36,10 +114,6 @@ export const seedMetadataEntities = async ({
     return;
   }
 
-  if (workspaceId === SEED_YCOMBINATOR_WORKSPACE_ID) {
-    return;
-  }
-
   await seedConnectedAccounts({ queryRunner, schemaName, workspaceId });
   await seedMessageChannels({ queryRunner, schemaName, workspaceId });
   await seedCalendarChannels({ queryRunner, schemaName, workspaceId });
@@ -51,40 +125,42 @@ const seedConnectedAccounts = async ({
   schemaName,
   workspaceId,
 }: SeedMetadataEntitiesArgs) => {
+  const ids = getSeedIds(workspaceId);
+
   const connectedAccounts = [
     {
-      id: CONNECTED_ACCOUNT_DATA_SEED_IDS.TIM,
+      id: ids.connectedAccountIds.TIM,
       handle: 'tim@apple.dev',
       provider: 'google',
-      userWorkspaceId: USER_WORKSPACE_DATA_SEED_IDS.TIM,
+      userWorkspaceId: ids.userWorkspaceIds.TIM,
       workspaceId,
     },
     {
-      id: CONNECTED_ACCOUNT_DATA_SEED_IDS.JONY,
+      id: ids.connectedAccountIds.JONY,
       handle: 'jony.ive@apple.dev',
       provider: 'google',
-      userWorkspaceId: USER_WORKSPACE_DATA_SEED_IDS.JONY,
+      userWorkspaceId: ids.userWorkspaceIds.JONY,
       workspaceId,
     },
     {
-      id: CONNECTED_ACCOUNT_DATA_SEED_IDS.PHIL,
+      id: ids.connectedAccountIds.PHIL,
       handle: 'phil.schiler@apple.dev',
       provider: 'google',
-      userWorkspaceId: USER_WORKSPACE_DATA_SEED_IDS.PHIL,
+      userWorkspaceId: ids.userWorkspaceIds.PHIL,
       workspaceId,
     },
     {
-      id: CONNECTED_ACCOUNT_DATA_SEED_IDS.JANE,
+      id: ids.connectedAccountIds.JANE,
       handle: 'jane.austen@apple.dev',
       provider: 'google',
-      userWorkspaceId: USER_WORKSPACE_DATA_SEED_IDS.JANE,
+      userWorkspaceId: ids.userWorkspaceIds.JANE,
       workspaceId,
     },
     {
-      id: CONNECTED_ACCOUNT_DATA_SEED_IDS.JANE_DELETABLE,
+      id: ids.connectedAccountIds.JANE_DELETABLE,
       handle: 'jane-deletable@apple.dev',
       provider: 'google',
-      userWorkspaceId: USER_WORKSPACE_DATA_SEED_IDS.JANE,
+      userWorkspaceId: ids.userWorkspaceIds.JANE,
       workspaceId,
     },
   ];
@@ -109,9 +185,11 @@ const seedMessageChannels = async ({
   schemaName,
   workspaceId,
 }: SeedMetadataEntitiesArgs) => {
+  const ids = getSeedIds(workspaceId);
+
   const messageChannels = [
     {
-      id: MESSAGE_CHANNEL_DATA_SEED_IDS.TIM,
+      id: ids.messageChannelIds.TIM,
       handle: 'tim@apple.dev',
       visibility: MessageChannelVisibility.SHARE_EVERYTHING,
       type: MessageChannelType.EMAIL,
@@ -123,11 +201,11 @@ const seedMessageChannels = async ({
       excludeGroupEmails: false,
       pendingGroupEmailsAction: 'NONE',
       isSyncEnabled: true,
-      connectedAccountId: CONNECTED_ACCOUNT_DATA_SEED_IDS.TIM,
+      connectedAccountId: ids.connectedAccountIds.TIM,
       workspaceId,
     },
     {
-      id: MESSAGE_CHANNEL_DATA_SEED_IDS.JONY,
+      id: ids.messageChannelIds.JONY,
       handle: 'jony.ive@apple.dev',
       visibility: MessageChannelVisibility.SHARE_EVERYTHING,
       type: MessageChannelType.EMAIL,
@@ -139,11 +217,27 @@ const seedMessageChannels = async ({
       excludeGroupEmails: false,
       pendingGroupEmailsAction: 'NONE',
       isSyncEnabled: true,
-      connectedAccountId: CONNECTED_ACCOUNT_DATA_SEED_IDS.JONY,
+      connectedAccountId: ids.connectedAccountIds.JONY,
       workspaceId,
     },
     {
-      id: MESSAGE_CHANNEL_DATA_SEED_IDS.JANE,
+      id: ids.messageChannelIds.PHIL,
+      handle: 'phil.schiler@apple.dev',
+      visibility: MessageChannelVisibility.SHARE_EVERYTHING,
+      type: MessageChannelType.EMAIL,
+      syncStage: MessageChannelSyncStage.MESSAGE_LIST_FETCH_PENDING,
+      isContactAutoCreationEnabled: true,
+      contactAutoCreationPolicy: 'SENT_AND_RECEIVED',
+      messageFolderImportPolicy: 'ALL_FOLDERS',
+      excludeNonProfessionalEmails: false,
+      excludeGroupEmails: false,
+      pendingGroupEmailsAction: 'NONE',
+      isSyncEnabled: true,
+      connectedAccountId: ids.connectedAccountIds.PHIL,
+      workspaceId,
+    },
+    {
+      id: ids.messageChannelIds.JANE,
       handle: 'jane.austen@apple.dev',
       visibility: MessageChannelVisibility.SHARE_EVERYTHING,
       type: MessageChannelType.EMAIL,
@@ -155,7 +249,39 @@ const seedMessageChannels = async ({
       excludeGroupEmails: false,
       pendingGroupEmailsAction: 'NONE',
       isSyncEnabled: true,
-      connectedAccountId: CONNECTED_ACCOUNT_DATA_SEED_IDS.JANE,
+      connectedAccountId: ids.connectedAccountIds.JANE,
+      workspaceId,
+    },
+    {
+      id: ids.messageChannelIds.SUPPORT,
+      handle: 'support@apple.dev',
+      visibility: MessageChannelVisibility.SHARE_EVERYTHING,
+      type: MessageChannelType.EMAIL,
+      syncStage: MessageChannelSyncStage.MESSAGE_LIST_FETCH_PENDING,
+      isContactAutoCreationEnabled: true,
+      contactAutoCreationPolicy: 'SENT_AND_RECEIVED',
+      messageFolderImportPolicy: 'ALL_FOLDERS',
+      excludeNonProfessionalEmails: false,
+      excludeGroupEmails: false,
+      pendingGroupEmailsAction: 'NONE',
+      isSyncEnabled: true,
+      connectedAccountId: ids.connectedAccountIds.TIM,
+      workspaceId,
+    },
+    {
+      id: ids.messageChannelIds.SALES,
+      handle: 'sales@apple.dev',
+      visibility: MessageChannelVisibility.SHARE_EVERYTHING,
+      type: MessageChannelType.EMAIL,
+      syncStage: MessageChannelSyncStage.MESSAGE_LIST_FETCH_PENDING,
+      isContactAutoCreationEnabled: true,
+      contactAutoCreationPolicy: 'SENT_AND_RECEIVED',
+      messageFolderImportPolicy: 'ALL_FOLDERS',
+      excludeNonProfessionalEmails: false,
+      excludeGroupEmails: false,
+      pendingGroupEmailsAction: 'NONE',
+      isSyncEnabled: true,
+      connectedAccountId: ids.connectedAccountIds.TIM,
       workspaceId,
     },
   ];
@@ -189,38 +315,73 @@ const seedCalendarChannels = async ({
   schemaName,
   workspaceId,
 }: SeedMetadataEntitiesArgs) => {
+  const ids = getSeedIds(workspaceId);
+
   const calendarChannels = [
     {
-      id: CALENDAR_CHANNEL_DATA_SEED_IDS.TIM,
+      id: ids.calendarChannelIds.TIM,
       handle: 'tim@apple.dev',
       visibility: CalendarChannelVisibility.METADATA,
       syncStage: 'CALENDAR_EVENT_LIST_FETCH_PENDING',
       isContactAutoCreationEnabled: true,
       contactAutoCreationPolicy: 'NONE',
       isSyncEnabled: true,
-      connectedAccountId: CONNECTED_ACCOUNT_DATA_SEED_IDS.TIM,
+      connectedAccountId: ids.connectedAccountIds.TIM,
       workspaceId,
     },
     {
-      id: CALENDAR_CHANNEL_DATA_SEED_IDS.JONY,
+      id: ids.calendarChannelIds.JONY,
       handle: 'jony@apple.dev',
       visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
       syncStage: 'CALENDAR_EVENT_LIST_FETCH_PENDING',
       isContactAutoCreationEnabled: true,
       contactAutoCreationPolicy: 'NONE',
       isSyncEnabled: true,
-      connectedAccountId: CONNECTED_ACCOUNT_DATA_SEED_IDS.JONY,
+      connectedAccountId: ids.connectedAccountIds.JONY,
       workspaceId,
     },
     {
-      id: CALENDAR_CHANNEL_DATA_SEED_IDS.JANE,
+      id: ids.calendarChannelIds.PHIL,
+      handle: 'phil@apple.dev',
+      visibility: CalendarChannelVisibility.METADATA,
+      syncStage: 'CALENDAR_EVENT_LIST_FETCH_PENDING',
+      isContactAutoCreationEnabled: true,
+      contactAutoCreationPolicy: 'NONE',
+      isSyncEnabled: true,
+      connectedAccountId: ids.connectedAccountIds.PHIL,
+      workspaceId,
+    },
+    {
+      id: ids.calendarChannelIds.JANE,
       handle: 'jane.austen@apple.dev',
       visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
       syncStage: 'CALENDAR_EVENT_LIST_FETCH_PENDING',
       isContactAutoCreationEnabled: true,
       contactAutoCreationPolicy: 'NONE',
       isSyncEnabled: true,
-      connectedAccountId: CONNECTED_ACCOUNT_DATA_SEED_IDS.JANE,
+      connectedAccountId: ids.connectedAccountIds.JANE,
+      workspaceId,
+    },
+    {
+      id: ids.calendarChannelIds.COMPANY_MAIN,
+      handle: 'company-main@apple.dev',
+      visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
+      syncStage: 'CALENDAR_EVENT_LIST_FETCH_PENDING',
+      isContactAutoCreationEnabled: true,
+      contactAutoCreationPolicy: 'NONE',
+      isSyncEnabled: true,
+      connectedAccountId: ids.connectedAccountIds.TIM,
+      workspaceId,
+    },
+    {
+      id: ids.calendarChannelIds.TEAM_CALENDAR,
+      handle: 'team-calendar@apple.dev',
+      visibility: CalendarChannelVisibility.SHARE_EVERYTHING,
+      syncStage: 'CALENDAR_EVENT_LIST_FETCH_PENDING',
+      isContactAutoCreationEnabled: true,
+      contactAutoCreationPolicy: 'NONE',
+      isSyncEnabled: true,
+      connectedAccountId: ids.connectedAccountIds.TIM,
       workspaceId,
     },
   ];
@@ -249,40 +410,42 @@ const seedMessageFolders = async ({
   schemaName,
   workspaceId,
 }: SeedMetadataEntitiesArgs) => {
+  const ids = getSeedIds(workspaceId);
+
   const messageFolders = [
     {
-      id: MESSAGE_FOLDER_DATA_SEED_IDS.TIM_INBOX,
+      id: ids.messageFolderIds.TIM_INBOX,
       name: 'INBOX',
       isSynced: true,
       isSentFolder: false,
-      messageChannelId: MESSAGE_CHANNEL_DATA_SEED_IDS.TIM,
+      messageChannelId: ids.messageChannelIds.TIM,
       workspaceId,
       pendingSyncAction: MessageFolderPendingSyncAction.NONE,
     },
     {
-      id: MESSAGE_FOLDER_DATA_SEED_IDS.JONY_INBOX,
+      id: ids.messageFolderIds.JONY_INBOX,
       name: 'INBOX',
       isSynced: true,
       isSentFolder: false,
-      messageChannelId: MESSAGE_CHANNEL_DATA_SEED_IDS.JONY,
+      messageChannelId: ids.messageChannelIds.JONY,
       workspaceId,
       pendingSyncAction: MessageFolderPendingSyncAction.NONE,
     },
     {
-      id: MESSAGE_FOLDER_DATA_SEED_IDS.JANE_INBOX,
+      id: ids.messageFolderIds.JANE_INBOX,
       name: 'INBOX',
       isSynced: true,
       isSentFolder: false,
-      messageChannelId: MESSAGE_CHANNEL_DATA_SEED_IDS.JANE,
+      messageChannelId: ids.messageChannelIds.JANE,
       workspaceId,
       pendingSyncAction: MessageFolderPendingSyncAction.NONE,
     },
     {
-      id: MESSAGE_FOLDER_DATA_SEED_IDS.JANE_SENT,
+      id: ids.messageFolderIds.JANE_SENT,
       name: 'Sent',
       isSynced: true,
       isSentFolder: true,
-      messageChannelId: MESSAGE_CHANNEL_DATA_SEED_IDS.JANE,
+      messageChannelId: ids.messageChannelIds.JANE,
       workspaceId,
       pendingSyncAction: MessageFolderPendingSyncAction.NONE,
     },

packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/constants/calendar-channel-data-seeds.constant.ts

@@ -1,5 +1,5 @@
+import { CalendarChannelVisibility } from 'twenty-shared/types';
 import { CONNECTED_ACCOUNT_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/connected-account-data-seeds.constant';
-import { CalendarChannelVisibility } from 'src/modules/calendar/common/standard-objects/calendar-channel.workspace-entity';
 
 type CalendarChannelDataSeed = {
   id: string;

packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/constants/message-channel-data-seeds.constant.ts

@@ -1,9 +1,9 @@
-import { CONNECTED_ACCOUNT_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/connected-account-data-seeds.constant';
 import {
   MessageChannelSyncStage,
   MessageChannelType,
   MessageChannelVisibility,
-} from 'src/modules/messaging/common/standard-objects/message-channel.workspace-entity';
+} from 'twenty-shared/types';
+import { CONNECTED_ACCOUNT_DATA_SEED_IDS } from 'src/engine/workspace-manager/dev-seeder/data/constants/connected-account-data-seeds.constant';
 
 type MessageChannelDataSeed = {
   id: string;

packages/twenty-server/src/engine/workspace-manager/dev-seeder/data/services/dev-seeder-data.service.ts

@@ -20,10 +20,6 @@ import {
   type AttachmentFileSeedMetadata,
   generateAttachmentSeedsForWorkspace,
 } from 'src/engine/workspace-manager/dev-seeder/data/constants/attachment-data-seeds.constant';
-import {
-  CALENDAR_CHANNEL_DATA_SEED_COLUMNS,
-  CALENDAR_CHANNEL_DATA_SEEDS,
-} from 'src/engine/workspace-manager/dev-seeder/data/constants/calendar-channel-data-seeds.constant';
 import {
   CALENDAR_CHANNEL_EVENT_ASSOCIATION_DATA_SEED_COLUMNS,
   CALENDAR_CHANNEL_EVENT_ASSOCIATION_DATA_SEEDS,
@@ -40,10 +36,6 @@ import {
   COMPANY_DATA_SEED_COLUMNS,
   COMPANY_DATA_SEEDS,
 } from 'src/engine/workspace-manager/dev-seeder/data/constants/company-data-seeds.constant';
-import {
-  CONNECTED_ACCOUNT_DATA_SEED_COLUMNS,
-  CONNECTED_ACCOUNT_DATA_SEEDS,
-} from 'src/engine/workspace-manager/dev-seeder/data/constants/connected-account-data-seeds.constant';
 import {
   DASHBOARD_DATA_SEED_COLUMNS,
   getDashboardDataSeeds,
@@ -52,10 +44,6 @@ import {
   EMPLOYMENT_HISTORY_DATA_SEED_COLUMNS,
   EMPLOYMENT_HISTORY_DATA_SEEDS,
 } from 'src/engine/workspace-manager/dev-seeder/data/constants/employment-history-data-seeds.constant';
-import {
-  MESSAGE_CHANNEL_DATA_SEED_COLUMNS,
-  MESSAGE_CHANNEL_DATA_SEEDS,
-} from 'src/engine/workspace-manager/dev-seeder/data/constants/message-channel-data-seeds.constant';
 import {
   MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_DATA_SEED_COLUMNS,
   MESSAGE_CHANNEL_MESSAGE_ASSOCIATION_DATA_SEEDS,
@@ -64,10 +52,6 @@ import {
   MESSAGE_DATA_SEED_COLUMNS,
   MESSAGE_DATA_SEEDS,
 } from 'src/engine/workspace-manager/dev-seeder/data/constants/message-data-seeds.constant';
-import {
-  MESSAGE_FOLDER_DATA_SEED_COLUMNS,
-  MESSAGE_FOLDER_DATA_SEEDS,
-} from 'src/engine/workspace-manager/dev-seeder/data/constants/message-folder-data-seeds.constant';
 import {
   getMessageParticipantDataSeeds,
   MESSAGE_PARTICIPANT_DATA_SEED_COLUMNS,
@@ -168,11 +152,6 @@ const getRecordSeedsBatches = (
       pgColumns: COMPANY_DATA_SEED_COLUMNS,
       recordSeeds: COMPANY_DATA_SEEDS,
     },
-    {
-      tableName: 'connectedAccount',
-      pgColumns: CONNECTED_ACCOUNT_DATA_SEED_COLUMNS,
-      recordSeeds: CONNECTED_ACCOUNT_DATA_SEEDS,
-    },
     {
       tableName: 'dashboard',
       pgColumns: DASHBOARD_DATA_SEED_COLUMNS,
@@ -192,25 +171,10 @@ const getRecordSeedsBatches = (
       pgColumns: PET_DATA_SEED_COLUMNS,
       recordSeeds: PET_DATA_SEEDS,
     },
-    {
-      tableName: 'calendarChannel',
-      pgColumns: CALENDAR_CHANNEL_DATA_SEED_COLUMNS,
-      recordSeeds: CALENDAR_CHANNEL_DATA_SEEDS,
-    },
-    {
-      tableName: 'messageChannel',
-      pgColumns: MESSAGE_CHANNEL_DATA_SEED_COLUMNS,
-      recordSeeds: MESSAGE_CHANNEL_DATA_SEEDS,
-    },
   ];
 
   // Batch 4: Depends on person/company/messageChannel or independent
   const batch4: RecordSeedConfig[] = [
-    {
-      tableName: 'messageFolder',
-      pgColumns: MESSAGE_FOLDER_DATA_SEED_COLUMNS,
-      recordSeeds: MESSAGE_FOLDER_DATA_SEEDS,
-    },
     {
       tableName: 'opportunity',
       pgColumns: OPPORTUNITY_DATA_SEED_COLUMNS,

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/build-standard-flat-field-metadata-maps.util.ts

@@ -17,8 +17,8 @@ import { buildDashboardStandardFlatFieldMetadatas } from 'src/engine/workspace-m
 import { buildFavoriteFolderStandardFlatFieldMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-favorite-folder-standard-flat-field-metadata.util';
 import { buildFavoriteStandardFlatFieldMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-favorite-standard-flat-field-metadata.util';
 import { buildMessageChannelMessageAssociationMessageFolderStandardFlatFieldMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-channel-message-association-message-folder-standard-flat-field-metadata.util';
-import { buildMessageChannelMessageAssociationStandardFlatFieldMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-channel-message-association-standard-flat-field-metadata.util';
 import { buildMessageChannelStandardFlatFieldMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-channel-standard-flat-field-metadata.util';
+import { buildMessageChannelMessageAssociationStandardFlatFieldMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-channel-message-association-standard-flat-field-metadata.util';
 import { buildMessageFolderStandardFlatFieldMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-folder-standard-flat-field-metadata.util';
 import { buildMessageParticipantStandardFlatFieldMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-participant-standard-flat-field-metadata.util';
 import { buildMessageStandardFlatFieldMetadatas } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-standard-flat-field-metadata.util';
@@ -44,9 +44,9 @@ type StandardFieldBuilder<P extends AllStandardObjectName> = (
 const STANDARD_FLAT_FIELD_METADATA_BUILDERS_BY_OBJECT_NAME = {
   attachment: buildAttachmentStandardFlatFieldMetadatas,
   blocklist: buildBlocklistStandardFlatFieldMetadatas,
+  calendarChannel: buildCalendarChannelStandardFlatFieldMetadatas,
   calendarChannelEventAssociation:
     buildCalendarChannelEventAssociationStandardFlatFieldMetadatas,
-  calendarChannel: buildCalendarChannelStandardFlatFieldMetadatas,
   calendarEventParticipant:
     buildCalendarEventParticipantStandardFlatFieldMetadatas,
   calendarEvent: buildCalendarEventStandardFlatFieldMetadatas,

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-calendar-channel-event-association-standard-flat-field-metadata.util.ts

@@ -234,25 +234,17 @@ export const buildCalendarChannelEventAssociationStandardFlatFieldMetadatas = ({
     twentyStandardApplicationId,
     now,
   }),
-  calendarChannel: createStandardRelationFieldFlatMetadata({
+  calendarChannelId: createStandardFieldFlatMetadata({
     objectName,
     workspaceId,
     context: {
-      type: FieldMetadataType.RELATION,
-      morphId: null,
-      fieldName: 'calendarChannel',
+      fieldName: 'calendarChannelId',
+      type: FieldMetadataType.UUID,
       label: i18nLabel(msg`Channel ID`),
       description: i18nLabel(msg`Channel ID`),
       icon: 'IconCalendar',
       isNullable: false,
       isUIReadOnly: true,
-      targetObjectName: 'calendarChannel',
-      targetFieldName: 'calendarChannelEventAssociations',
-      settings: {
-        relationType: RelationType.MANY_TO_ONE,
-        onDelete: RelationOnDeleteAction.CASCADE,
-        joinColumnName: 'calendarChannelId',
-      },
     },
     standardObjectMetadataRelatedEntityIds,
     dependencyFlatEntityMaps,

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-calendar-channel-standard-flat-field-metadata.util.ts

@@ -561,27 +561,4 @@ export const buildCalendarChannelStandardFlatFieldMetadatas = ({
     twentyStandardApplicationId,
     now,
   }),
-  calendarChannelEventAssociations: createStandardRelationFieldFlatMetadata({
-    objectName,
-    workspaceId,
-    context: {
-      type: FieldMetadataType.RELATION,
-      morphId: null,
-      fieldName: 'calendarChannelEventAssociations',
-      label: i18nLabel(msg`Calendar Channel Event Associations`),
-      description: i18nLabel(msg`Calendar Channel Event Associations`),
-      icon: 'IconCalendar',
-      isNullable: false,
-      isUIReadOnly: true,
-      targetObjectName: 'calendarChannelEventAssociation',
-      targetFieldName: 'calendarChannel',
-      settings: {
-        relationType: RelationType.ONE_TO_MANY,
-      },
-    },
-    standardObjectMetadataRelatedEntityIds,
-    dependencyFlatEntityMaps,
-    twentyStandardApplicationId,
-    now,
-  }),
 });

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-channel-message-association-message-folder-standard-flat-field-metadata.util.ts

@@ -229,25 +229,17 @@ export const buildMessageChannelMessageAssociationMessageFolderStandardFlatField
       twentyStandardApplicationId,
       now,
     }),
-    messageFolder: createStandardRelationFieldFlatMetadata({
+    messageFolderId: createStandardFieldFlatMetadata({
       objectName,
       workspaceId,
       context: {
-        type: FieldMetadataType.RELATION,
-        morphId: null,
-        fieldName: 'messageFolder',
+        fieldName: 'messageFolderId',
+        type: FieldMetadataType.UUID,
         label: i18nLabel(msg`Message Folder`),
         description: i18nLabel(msg`Message Folder`),
         icon: 'IconFolder',
         isNullable: false,
         isUIReadOnly: true,
-        targetObjectName: 'messageFolder',
-        targetFieldName: 'messageChannelMessageAssociationMessageFolders',
-        settings: {
-          relationType: RelationType.MANY_TO_ONE,
-          onDelete: RelationOnDeleteAction.CASCADE,
-          joinColumnName: 'messageFolderId',
-        },
       },
       standardObjectMetadataRelatedEntityIds,
       dependencyFlatEntityMaps,

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-channel-message-association-standard-flat-field-metadata.util.ts

@@ -273,25 +273,17 @@ export const buildMessageChannelMessageAssociationStandardFlatFieldMetadatas =
       twentyStandardApplicationId,
       now,
     }),
-    messageChannel: createStandardRelationFieldFlatMetadata({
+    messageChannelId: createStandardFieldFlatMetadata({
       objectName,
       workspaceId,
       context: {
-        type: FieldMetadataType.RELATION,
-        morphId: null,
-        fieldName: 'messageChannel',
+        fieldName: 'messageChannelId',
+        type: FieldMetadataType.UUID,
         label: i18nLabel(msg`Message Channel Id`),
         description: i18nLabel(msg`Message Channel Id`),
         icon: 'IconHash',
         isNullable: true,
         isUIReadOnly: true,
-        targetObjectName: 'messageChannel',
-        targetFieldName: 'messageChannelMessageAssociations',
-        settings: {
-          relationType: RelationType.MANY_TO_ONE,
-          onDelete: RelationOnDeleteAction.CASCADE,
-          joinColumnName: 'messageChannelId',
-        },
       },
       standardObjectMetadataRelatedEntityIds,
       dependencyFlatEntityMaps,

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-channel-standard-flat-field-metadata.util.ts

@@ -724,50 +724,4 @@ export const buildMessageChannelStandardFlatFieldMetadatas = ({
     twentyStandardApplicationId,
     now,
   }),
-  messageChannelMessageAssociations: createStandardRelationFieldFlatMetadata({
-    objectName,
-    workspaceId,
-    context: {
-      type: FieldMetadataType.RELATION,
-      morphId: null,
-      fieldName: 'messageChannelMessageAssociations',
-      label: i18nLabel(msg`Message Channel Association`),
-      description: i18nLabel(msg`Messages from the channel.`),
-      icon: 'IconMessage',
-      isNullable: true,
-      isUIReadOnly: true,
-      targetObjectName: 'messageChannelMessageAssociation',
-      targetFieldName: 'messageChannel',
-      settings: {
-        relationType: RelationType.ONE_TO_MANY,
-      },
-    },
-    standardObjectMetadataRelatedEntityIds,
-    dependencyFlatEntityMaps,
-    twentyStandardApplicationId,
-    now,
-  }),
-  messageFolders: createStandardRelationFieldFlatMetadata({
-    objectName,
-    workspaceId,
-    context: {
-      type: FieldMetadataType.RELATION,
-      morphId: null,
-      fieldName: 'messageFolders',
-      label: i18nLabel(msg`Message Folders`),
-      description: i18nLabel(msg`Message Folders`),
-      icon: 'IconFolder',
-      isNullable: true,
-      isUIReadOnly: true,
-      targetObjectName: 'messageFolder',
-      targetFieldName: 'messageChannel',
-      settings: {
-        relationType: RelationType.ONE_TO_MANY,
-      },
-    },
-    standardObjectMetadataRelatedEntityIds,
-    dependencyFlatEntityMaps,
-    twentyStandardApplicationId,
-    now,
-  }),
 });

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/compute-message-folder-standard-flat-field-metadata.util.ts

@@ -1,11 +1,6 @@
 import { msg } from '@lingui/core/macro';
 import { i18nLabel } from 'src/engine/workspace-manager/twenty-standard-application/utils/i18n-label.util';
-import {
-  DateDisplayFormat,
-  FieldMetadataType,
-  RelationOnDeleteAction,
-  RelationType,
-} from 'twenty-shared/types';
+import { DateDisplayFormat, FieldMetadataType } from 'twenty-shared/types';
 
 import { type FlatFieldMetadata } from 'src/engine/metadata-modules/flat-field-metadata/types/flat-field-metadata.type';
 import { type AllStandardObjectFieldName } from 'src/engine/workspace-manager/twenty-standard-application/types/all-standard-object-field-name.type';
@@ -13,7 +8,6 @@ import {
   type CreateStandardFieldArgs,
   createStandardFieldFlatMetadata,
 } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/create-standard-field-flat-metadata.util';
-import { createStandardRelationFieldFlatMetadata } from 'src/engine/workspace-manager/twenty-standard-application/utils/field-metadata/create-standard-relation-field-flat-metadata.util';
 import { getTsVectorColumnExpressionFromFields } from 'src/engine/workspace-manager/utils/get-ts-vector-column-expression.util';
 import { SEARCH_FIELDS_FOR_MESSAGE_FOLDER } from 'src/modules/messaging/common/standard-objects/message-folder.workspace-entity';
 
@@ -333,55 +327,21 @@ export const buildMessageFolderStandardFlatFieldMetadatas = ({
     twentyStandardApplicationId,
     now,
   }),
-  messageChannel: createStandardRelationFieldFlatMetadata({
+  messageChannelId: createStandardFieldFlatMetadata({
     objectName,
     workspaceId,
     context: {
-      type: FieldMetadataType.RELATION,
-      morphId: null,
-      fieldName: 'messageChannel',
+      fieldName: 'messageChannelId',
+      type: FieldMetadataType.UUID,
       label: i18nLabel(msg`Message Channel`),
       description: i18nLabel(msg`Message Channel`),
       icon: 'IconMessage',
       isNullable: false,
       isUIReadOnly: true,
-      targetObjectName: 'messageChannel',
-      targetFieldName: 'messageFolders',
-      settings: {
-        relationType: RelationType.MANY_TO_ONE,
-        onDelete: RelationOnDeleteAction.CASCADE,
-        joinColumnName: 'messageChannelId',
-      },
     },
     standardObjectMetadataRelatedEntityIds,
     dependencyFlatEntityMaps,
     twentyStandardApplicationId,
     now,
   }),
-  messageChannelMessageAssociationMessageFolders:
-    createStandardRelationFieldFlatMetadata({
-      objectName,
-      workspaceId,
-      context: {
-        type: FieldMetadataType.RELATION,
-        morphId: null,
-        fieldName: 'messageChannelMessageAssociationMessageFolders',
-        label: i18nLabel(msg`Message Association Folders`),
-        description: i18nLabel(
-          msg`Message Association Folders (supports multiple folders/labels)`,
-        ),
-        icon: 'IconFolders',
-        isNullable: true,
-        isUIReadOnly: true,
-        targetObjectName: 'messageChannelMessageAssociationMessageFolder',
-        targetFieldName: 'messageFolder',
-        settings: {
-          relationType: RelationType.ONE_TO_MANY,
-        },
-      },
-      standardObjectMetadataRelatedEntityIds,
-      dependencyFlatEntityMaps,
-      twentyStandardApplicationId,
-      now,
-    }),
 });

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-calendar-channel-event-association-standard-flat-index-metadata.util.ts

@@ -24,7 +24,7 @@ export const buildCalendarChannelEventAssociationStandardFlatIndexMetadatas = ({
     workspaceId,
     context: {
       indexName: 'calendarChannelIdIndex',
-      relatedFieldNames: ['calendarChannel'],
+      relatedFieldNames: ['calendarChannelId'],
     },
     standardObjectMetadataRelatedEntityIds,
     dependencyFlatEntityMaps,

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-message-channel-message-association-message-folder-standard-flat-index-metadata.util.ts

@@ -37,7 +37,7 @@ export const buildMessageChannelMessageAssociationMessageFolderStandardFlatIndex
       workspaceId,
       context: {
         indexName: 'messageFolderIdIndex',
-        relatedFieldNames: ['messageFolder'],
+        relatedFieldNames: ['messageFolderId'],
       },
       standardObjectMetadataRelatedEntityIds,
       dependencyFlatEntityMaps,
@@ -53,7 +53,7 @@ export const buildMessageChannelMessageAssociationMessageFolderStandardFlatIndex
             'messageChannelMessageAssociationIdMessageFolderIdUniqueIndex',
           relatedFieldNames: [
             'messageChannelMessageAssociation',
-            'messageFolder',
+            'messageFolderId',
           ],
           isUnique: true,
           indexWhereClause: '"deletedAt" IS NULL',

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-message-channel-message-association-standard-flat-index-metadata.util.ts

@@ -25,7 +25,7 @@ export const buildMessageChannelMessageAssociationStandardFlatIndexMetadatas =
       workspaceId,
       context: {
         indexName: 'messageChannelIdIndex',
-        relatedFieldNames: ['messageChannel'],
+        relatedFieldNames: ['messageChannelId'],
       },
       standardObjectMetadataRelatedEntityIds,
       dependencyFlatEntityMaps,
@@ -49,7 +49,7 @@ export const buildMessageChannelMessageAssociationStandardFlatIndexMetadatas =
       workspaceId,
       context: {
         indexName: 'messageChannelIdMessageIdUniqueIndex',
-        relatedFieldNames: ['messageChannel', 'message'],
+        relatedFieldNames: ['messageChannelId', 'message'],
         isUnique: true,
         indexWhereClause: '"deletedAt" IS NULL',
       },

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/index/compute-message-folder-standard-flat-index-metadata.util.ts

@@ -21,7 +21,7 @@ export const buildMessageFolderStandardFlatIndexMetadatas = ({
     workspaceId,
     context: {
       indexName: 'messageChannelIdIndex',
-      relatedFieldNames: ['messageChannel'],
+      relatedFieldNames: ['messageChannelId'],
     },
     standardObjectMetadataRelatedEntityIds,
     dependencyFlatEntityMaps,

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-calendar-channel-event-association-view-fields.util.ts

@@ -17,8 +17,8 @@ export const computeStandardCalendarChannelEventAssociationViewFields = (
         objectName: 'calendarChannelEventAssociation',
         context: {
           viewName: 'allCalendarChannelEventAssociations',
-          viewFieldName: 'calendarChannel',
-          fieldName: 'calendarChannel',
+          viewFieldName: 'calendarChannelId',
+          fieldName: 'calendarChannelId',
           position: 0,
           isVisible: true,
           size: 150,
@@ -70,8 +70,8 @@ export const computeStandardCalendarChannelEventAssociationViewFields = (
         objectName: 'calendarChannelEventAssociation',
         context: {
           viewName: 'calendarChannelEventAssociationRecordPageFields',
-          viewFieldName: 'calendarChannel',
-          fieldName: 'calendarChannel',
+          viewFieldName: 'calendarChannelId',
+          fieldName: 'calendarChannelId',
           position: 0,
           isVisible: true,
           size: 150,

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-channel-message-association-message-folder-view-fields.util.ts

@@ -31,8 +31,8 @@ export const computeStandardMessageChannelMessageAssociationMessageFolderViewFie
           objectName: 'messageChannelMessageAssociationMessageFolder',
           context: {
             viewName: 'allMessageChannelMessageAssociationMessageFolders',
-            viewFieldName: 'messageFolder',
-            fieldName: 'messageFolder',
+            viewFieldName: 'messageFolderId',
+            fieldName: 'messageFolderId',
             position: 1,
             isVisible: true,
             size: 150,
@@ -74,8 +74,8 @@ export const computeStandardMessageChannelMessageAssociationMessageFolderViewFie
           context: {
             viewName:
               'messageChannelMessageAssociationMessageFolderRecordPageFields',
-            viewFieldName: 'messageFolder',
-            fieldName: 'messageFolder',
+            viewFieldName: 'messageFolderId',
+            fieldName: 'messageFolderId',
             position: 1,
             isVisible: true,
             size: 150,

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-channel-message-association-view-fields.util.ts

@@ -17,8 +17,8 @@ export const computeStandardMessageChannelMessageAssociationViewFields = (
         objectName: 'messageChannelMessageAssociation',
         context: {
           viewName: 'allMessageChannelMessageAssociations',
-          viewFieldName: 'messageChannel',
-          fieldName: 'messageChannel',
+          viewFieldName: 'messageChannelId',
+          fieldName: 'messageChannelId',
           position: 0,
           isVisible: true,
           size: 150,
@@ -83,8 +83,8 @@ export const computeStandardMessageChannelMessageAssociationViewFields = (
         objectName: 'messageChannelMessageAssociation',
         context: {
           viewName: 'messageChannelMessageAssociationRecordPageFields',
-          viewFieldName: 'messageChannel',
-          fieldName: 'messageChannel',
+          viewFieldName: 'messageChannelId',
+          fieldName: 'messageChannelId',
           position: 0,
           isVisible: true,
           size: 150,

packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/view-field/compute-standard-message-folder-view-fields.util.ts

@@ -25,8 +25,8 @@ export const computeStandardMessageFolderViewFields = (
       objectName: 'messageFolder',
       context: {
         viewName: 'allMessageFolders',
-        viewFieldName: 'messageChannel',
-        fieldName: 'messageChannel',
+        viewFieldName: 'messageChannelId',
+        fieldName: 'messageChannelId',
         position: 1,
         isVisible: true,
         size: 150,
@@ -75,8 +75,8 @@ export const computeStandardMessageFolderViewFields = (
         objectName: 'messageFolder',
         context: {
           viewName: 'messageFolderRecordPageFields',
-          viewFieldName: 'messageChannel',
-          fieldName: 'messageChannel',
+          viewFieldName: 'messageChannelId',
+          fieldName: 'messageChannelId',
           position: 1,
           isVisible: true,
           size: 150,

packages/twenty-server/src/engine/workspace-manager/workspace-migration/constant/default-feature-flags.ts

@@ -1,6 +1,5 @@
 import { FeatureFlagKey } from 'twenty-shared/types';
 
 export const DEFAULT_FEATURE_FLAGS = [
-  FeatureFlagKey.IS_CONNECTED_ACCOUNT_MIGRATED,
   FeatureFlagKey.IS_DATASOURCE_MIGRATED,
 ] as const satisfies FeatureFlagKey[];