Fix

In this PR:
- create a command to remove duplicate (groupBy messageId,
messageChannelId) within messageChannelmessageAssociaitions.

THis is needed to apply a constraint already present on
messageChannelmessageAssociaitions (to be executed before syncing
metadata)

packages/twenty-e2e-testing/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twenty-e2e-testing",
-  "version": "0.41.0-canary",
+  "version": "0.40.7",
   "description": "",
   "author": "",
   "private": true,

packages/twenty-emails/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twenty-emails",
-  "version": "0.41.0-canary",
+  "version": "0.40.7",
   "description": "",
   "author": "",
   "private": true,

packages/twenty-front/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twenty-front",
-  "version": "0.41.0-canary",
+  "version": "0.40.7",
   "private": true,
   "type": "module",
   "scripts": {

packages/twenty-front/src/modules/favorites/components/WorkspaceFavorites.tsx

@@ -1,11 +1,10 @@
-import { useFilteredObjectMetadataItemsForWorkspaceFavorites } from '@/navigation/hooks/useObjectMetadataItemsInWorkspaceFavorites';
+import { useWorkspaceFavorites } from '@/favorites/hooks/useWorkspaceFavorites';
 import { NavigationDrawerSectionForObjectMetadataItems } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems';
 import { NavigationDrawerSectionForObjectMetadataItemsSkeletonLoader } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItemsSkeletonLoader';
 import { useIsPrefetchLoading } from '@/prefetch/hooks/useIsPrefetchLoading';
 
 export const WorkspaceFavorites = () => {
-  const { activeObjectMetadataItems: objectMetadataItemsToDisplay } =
-    useFilteredObjectMetadataItemsForWorkspaceFavorites();
+  const { workspaceFavoritesObjectMetadataItems } = useWorkspaceFavorites();
 
   const loading = useIsPrefetchLoading();
 
@@ -16,7 +15,7 @@ export const WorkspaceFavorites = () => {
   return (
     <NavigationDrawerSectionForObjectMetadataItems
       sectionTitle={'Workspace'}
-      objectMetadataItems={objectMetadataItemsToDisplay}
+      objectMetadataItems={workspaceFavoritesObjectMetadataItems}
       isRemote={false}
     />
   );

packages/twenty-front/src/modules/favorites/hooks/useWorkspaceFavorites.ts

@@ -1,4 +1,5 @@
 import { sortFavorites } from '@/favorites/utils/sortFavorites';
+import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
 import { useGetObjectRecordIdentifierByNameSingular } from '@/object-metadata/hooks/useGetObjectRecordIdentifierByNameSingular';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
@@ -13,6 +14,7 @@ import { usePrefetchedFavoritesData } from './usePrefetchedFavoritesData';
 
 export const useWorkspaceFavorites = () => {
   const { workspaceFavorites } = usePrefetchedFavoritesData();
+
   const { records: views } = usePrefetchedData<View>(PrefetchKey.AllViews);
   const objectMetadataItems = useRecoilValue(objectMetadataItemsState);
   const { objectMetadataItem: favoriteObjectMetadataItem } =
@@ -52,5 +54,29 @@ export const useWorkspaceFavorites = () => {
     ],
   );
 
-  return { sortedWorkspaceFavorites };
+  const workspaceFavoriteIds = new Set(
+    sortedWorkspaceFavorites.map((favorite) => favorite.recordId),
+  );
+
+  const favoriteViewObjectMetadataIds = new Set(
+    views.reduce<string[]>((acc, view) => {
+      if (workspaceFavoriteIds.has(view.id)) {
+        acc.push(view.objectMetadataId);
+      }
+      return acc;
+    }, []),
+  );
+
+  const { activeObjectMetadataItems } = useFilteredObjectMetadataItems();
+
+  const activeObjectMetadataItemsInWorkspaceFavorites =
+    activeObjectMetadataItems.filter((item) =>
+      favoriteViewObjectMetadataIds.has(item.id),
+    );
+
+  return {
+    workspaceFavorites: sortedWorkspaceFavorites,
+    workspaceFavoritesObjectMetadataItems:
+      activeObjectMetadataItemsInWorkspaceFavorites,
+  };
 };

packages/twenty-front/src/modules/navigation/hooks/useObjectMetadataItemsInWorkspaceFavorites.ts

@@ -1,36 +0,0 @@
-import { useWorkspaceFavorites } from '@/favorites/hooks/useWorkspaceFavorites';
-import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
-import { usePrefetchedData } from '@/prefetch/hooks/usePrefetchedData';
-import { PrefetchKey } from '@/prefetch/types/PrefetchKey';
-import { View } from '@/views/types/View';
-
-export const useFilteredObjectMetadataItemsForWorkspaceFavorites = () => {
-  const { records: views } = usePrefetchedData<View>(PrefetchKey.AllViews);
-
-  const { sortedWorkspaceFavorites: workspaceFavorites } =
-    useWorkspaceFavorites();
-
-  const workspaceFavoriteIds = new Set(
-    workspaceFavorites.map((favorite) => favorite.recordId),
-  );
-
-  const favoriteViewObjectMetadataIds = new Set(
-    views.reduce<string[]>((acc, view) => {
-      if (workspaceFavoriteIds.has(view.id)) {
-        acc.push(view.objectMetadataId);
-      }
-      return acc;
-    }, []),
-  );
-
-  const { activeObjectMetadataItems } = useFilteredObjectMetadataItems();
-
-  const activeObjectMetadataItemsInWorkspaceFavorites =
-    activeObjectMetadataItems.filter((item) =>
-      favoriteViewObjectMetadataIds.has(item.id),
-    );
-
-  return {
-    activeObjectMetadataItems: activeObjectMetadataItemsInWorkspaceFavorites,
-  };
-};

packages/twenty-front/src/modules/object-metadata/components/NavigationDrawerOpenedSection.tsx

@@ -1,6 +1,6 @@
 import { useParams } from 'react-router-dom';
 
-import { useFilteredObjectMetadataItemsForWorkspaceFavorites } from '@/navigation/hooks/useObjectMetadataItemsInWorkspaceFavorites';
+import { useWorkspaceFavorites } from '@/favorites/hooks/useWorkspaceFavorites';
 import { NavigationDrawerSectionForObjectMetadataItems } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItems';
 import { NavigationDrawerSectionForObjectMetadataItemsSkeletonLoader } from '@/object-metadata/components/NavigationDrawerSectionForObjectMetadataItemsSkeletonLoader';
 import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
@@ -14,8 +14,7 @@ export const NavigationDrawerOpenedSection = () => {
 
   const loading = useIsPrefetchLoading();
 
-  const { activeObjectMetadataItems: workspaceFavoritesObjectMetadataItems } =
-    useFilteredObjectMetadataItemsForWorkspaceFavorites();
+  const { workspaceFavoritesObjectMetadataItems } = useWorkspaceFavorites();
 
   const {
     objectNamePlural: currentObjectNamePlural,

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

@@ -1,7 +1,5 @@
-import { useApolloClient, useMutation } from '@apollo/client';
+import { useMutation } from '@apollo/client';
 
-import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecordsQuery';
 import {
   CreateObjectInput,
   CreateOneObjectMetadataItemMutation,
@@ -15,14 +13,9 @@ import { useApolloMetadataClient } from './useApolloMetadataClient';
 
 export const useCreateOneObjectMetadataItem = () => {
   const apolloMetadataClient = useApolloMetadataClient();
-  const apolloClient = useApolloClient();
   const { refreshObjectMetadataItems } =
     useRefreshObjectMetadataItems('network-only');
 
-  const { findManyRecordsQuery } = useFindManyRecordsQuery({
-    objectNameSingular: CoreObjectNameSingular.View,
-  });
-
   const [mutate] = useMutation<
     CreateOneObjectMetadataItemMutation,
     CreateOneObjectMetadataItemMutationVariables
@@ -42,15 +35,7 @@ export const useCreateOneObjectMetadataItem = () => {
     return createdObjectMetadata;
   };
 
-  const findManyRecordsCache = async () => {
-    await apolloClient.query({
-      query: findManyRecordsQuery,
-      fetchPolicy: 'network-only',
-    });
-  };
-
   return {
     createOneObjectMetadataItem,
-    findManyRecordsCache,
   };
 };

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

@@ -72,10 +72,14 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
     useQuery<RecordGqlOperationFindManyResult>(findManyRecordsQuery, {
       skip: skip || !objectMetadataItem,
       variables: {
-        filter: {
-          ...filter,
-          ...(withSoftDeleted ? withSoftDeleterFilter : {}),
-        },
+        ...(filter || withSoftDeleted
+          ? {
+              filter: {
+                ...filter,
+                ...(withSoftDeleted ? withSoftDeleterFilter : {}),
+              },
+            }
+          : {}),
         orderBy,
         lastCursor: cursorFilter?.cursor ?? undefined,
         limit: cursorFilter?.limit ?? limit,

packages/twenty-front/src/modules/prefetch/hooks/internal/useUpsertRecordsInCacheForPrefetchKey.ts

@@ -34,6 +34,7 @@ export const useUpsertRecordsInCacheForPrefetchKey = <T extends ObjectRecord>({
 
   const upsertRecordsInCache = (records: T[]) => {
     setPrefetchDataIsLoaded(false);
+
     upsertFindManyRecordsQueryInCache({
       queryVariables: operationSignature.variables,
       recordGqlFields: operationSignature.fields,

packages/twenty-front/src/modules/ui/input/components/TextInputV2.tsx

@@ -59,7 +59,7 @@ const StyledInput = styled.input<
   padding: ${({ theme, sizeVariant }) =>
     sizeVariant === 'sm' ? `${theme.spacing(2)} 0` : theme.spacing(2)};
   padding-left: ${({ theme, LeftIcon }) =>
-    LeftIcon ? `px` : theme.spacing(2)};
+    LeftIcon ? `calc(${theme.spacing(4)} + 16px)` : theme.spacing(2)};
   width: ${({ theme, width }) =>
     width ? `calc(${width}px + ${theme.spacing(5)})` : '100%'};
 

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

@@ -28,8 +28,7 @@ export const SettingsNewObject = () => {
   const navigate = useNavigateSettings();
   const { enqueueSnackBar } = useSnackBar();
 
-  const { createOneObjectMetadataItem, findManyRecordsCache } =
-    useCreateOneObjectMetadataItem();
+  const { createOneObjectMetadataItem } = useCreateOneObjectMetadataItem();
 
   const formConfig = useForm<SettingsDataModelNewObjectFormValues>({
     mode: 'onTouched',
@@ -53,8 +52,6 @@ export const SettingsNewObject = () => {
           ? { objectNamePlural: response.createOneObject.namePlural }
           : undefined,
       );
-
-      await findManyRecordsCache();
     } catch (error) {
       enqueueSnackBar((error as Error).message, {
         variant: SnackBarVariant.Error,

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

@@ -137,6 +137,10 @@ export const SettingsObjectNewFieldConfigure = () => {
     formValues: SettingsDataModelNewFieldFormValues,
   ) => {
     try {
+      navigate(SettingsPath.ObjectDetail, {
+        objectNamePlural,
+      });
+
       if (
         formValues.type === FieldMetadataType.RELATION &&
         'relation' in formValues
@@ -172,10 +176,6 @@ export const SettingsObjectNewFieldConfigure = () => {
         });
       }
 
-      navigate(SettingsPath.ObjectDetail, {
-        objectNamePlural,
-      });
-
       // TODO: fix optimistic update logic
       // Forcing a refetch for now but it's not ideal
       await apolloClient.refetchQueries({

packages/twenty-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twenty-server",
-  "version": "0.41.0-canary",
+  "version": "0.40.7",
   "description": "",
   "author": "",
   "private": true,

packages/twenty-server/src/database/commands/upgrade-version/0-41/0-41-remove-duplicate-mcmas.ts

@@ -0,0 +1,96 @@
+import { Logger } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+import { Command } from 'nest-commander';
+import { Repository } from 'typeorm';
+
+import {
+  ActiveWorkspacesCommandOptions,
+  ActiveWorkspacesCommandRunner,
+} from 'src/database/commands/active-workspaces.command';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
+import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
+
+@Command({
+  name: 'upgrade-0.41:remove-duplicate-mcmas',
+  description: 'Remove duplicate mcmas.',
+})
+export class RemoveDuplicateMcmasCommand extends ActiveWorkspacesCommandRunner {
+  protected readonly logger: Logger;
+
+  constructor(
+    @InjectRepository(Workspace, 'core')
+    protected readonly workspaceRepository: Repository<Workspace>,
+    private readonly twentyORMGlobalManager: TwentyORMGlobalManager,
+  ) {
+    super(workspaceRepository);
+    this.logger = new Logger(this.constructor.name);
+  }
+
+  async executeActiveWorkspacesCommand(
+    _passedParam: string[],
+    _options: ActiveWorkspacesCommandOptions,
+    workspaceIds: string[],
+  ): Promise<void> {
+    const { dryRun } = _options;
+
+    for (const workspaceId of workspaceIds) {
+      try {
+        await this.execute(workspaceId, dryRun);
+      } catch (error) {
+        this.logger.error(
+          `Error removing duplicate mcmas for workspace ${workspaceId}: ${error}`,
+        );
+      }
+    }
+  }
+
+  private async execute(workspaceId: string, dryRun = false): Promise<void> {
+    this.logger.log(`Removing duplicate mcmas for workspace: ${workspaceId}`);
+
+    const repository =
+      await this.twentyORMGlobalManager.getRepositoryForWorkspace(
+        workspaceId,
+        'messageChannelMessageAssociation',
+      );
+
+    const queryBuilder = repository.createQueryBuilder(
+      'messageChannelMessageAssociation',
+    );
+
+    const duplicateMcmas = await queryBuilder
+      .select(`"messageChannelId"`)
+      .addSelect(`"messageId"`)
+      .where(`"deletedAt" IS NULL`)
+      .groupBy(`"messageId"`)
+      .addGroupBy(`"messageChannelId"`)
+      .having(`COUNT("messageChannelId") > 1`)
+      .getRawMany();
+
+    this.logger.log(`Found ${duplicateMcmas.length} duplicate mcmas`);
+
+    for (const duplicateMca of duplicateMcmas) {
+      const mcmas = await repository.find({
+        where: {
+          messageId: duplicateMca.messageId,
+          messageChannelId: duplicateMca.messageChannelId,
+        },
+      });
+
+      this.logger.log(
+        `Found ${mcmas.length} mcmas for message ${duplicateMca.messageId} and message channel ${duplicateMca.messageChannelId}`,
+      );
+
+      const mcaIdsToDelete = mcmas.slice(1).map((mca) => mca.id);
+
+      if (mcaIdsToDelete.length > 0) {
+        this.logger.log(`Deleting ${mcaIdsToDelete.length} mcas`);
+        if (!dryRun) {
+          await repository.delete(mcaIdsToDelete);
+        }
+      }
+    }
+
+    this.twentyORMGlobalManager.destroyDataSourceForWorkspace(workspaceId);
+  }
+}

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

@@ -6,6 +6,7 @@ import { Repository } from 'typeorm';
 import { ActiveWorkspacesCommandRunner } from 'src/database/commands/active-workspaces.command';
 import { BaseCommandOptions } from 'src/database/commands/base.command';
 import { MigrateRelationsToFieldMetadataCommand } from 'src/database/commands/upgrade-version/0-41/0-41-migrate-relations-to-field-metadata.command';
+import { RemoveDuplicateMcmasCommand } from 'src/database/commands/upgrade-version/0-41/0-41-remove-duplicate-mcmas';
 import { SeedWorkflowViewsCommand } from 'src/database/commands/upgrade-version/0-41/0-41-seed-workflow-views.command';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import { SyncWorkspaceMetadataCommand } from 'src/engine/workspace-manager/workspace-sync-metadata/commands/sync-workspace-metadata.command';
@@ -21,6 +22,7 @@ export class UpgradeTo0_41Command extends ActiveWorkspacesCommandRunner {
     private readonly seedWorkflowViewsCommand: SeedWorkflowViewsCommand,
     private readonly syncWorkspaceMetadataCommand: SyncWorkspaceMetadataCommand,
     private readonly migrateRelationsToFieldMetadata: MigrateRelationsToFieldMetadataCommand,
+    private readonly removeDuplicateMcmasCommand: RemoveDuplicateMcmasCommand,
   ) {
     super(workspaceRepository);
   }
@@ -32,6 +34,12 @@ export class UpgradeTo0_41Command extends ActiveWorkspacesCommandRunner {
   ): Promise<void> {
     this.logger.log('Running command to upgrade to 0.41');
 
+    await this.removeDuplicateMcmasCommand.executeActiveWorkspacesCommand(
+      passedParam,
+      options,
+      workspaceIds,
+    );
+
     await this.syncWorkspaceMetadataCommand.executeActiveWorkspacesCommand(
       passedParam,
       {

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

@@ -2,6 +2,7 @@ import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { MigrateRelationsToFieldMetadataCommand } from 'src/database/commands/upgrade-version/0-41/0-41-migrate-relations-to-field-metadata.command';
+import { RemoveDuplicateMcmasCommand } from 'src/database/commands/upgrade-version/0-41/0-41-remove-duplicate-mcmas';
 import { SeedWorkflowViewsCommand } from 'src/database/commands/upgrade-version/0-41/0-41-seed-workflow-views.command';
 import { UpgradeTo0_41Command } from 'src/database/commands/upgrade-version/0-41/0-41-upgrade-version.command';
 import { TypeORMModule } from 'src/database/typeorm/typeorm.module';
@@ -32,6 +33,7 @@ import { WorkspaceSyncMetadataModule } from 'src/engine/workspace-manager/worksp
     SeedWorkflowViewsCommand,
     UpgradeTo0_41Command,
     MigrateRelationsToFieldMetadataCommand,
+    RemoveDuplicateMcmasCommand,
   ],
 })
 export class UpgradeTo0_41CommandModule {}

packages/twenty-server/src/modules/messaging/common/standard-objects/message-channel-message-association.workspace-entity.ts

@@ -6,6 +6,7 @@ import { RelationMetadataType } from 'src/engine/metadata-modules/relation-metad
 import { BaseWorkspaceEntity } from 'src/engine/twenty-orm/base.workspace-entity';
 import { WorkspaceEntity } from 'src/engine/twenty-orm/decorators/workspace-entity.decorator';
 import { WorkspaceField } from 'src/engine/twenty-orm/decorators/workspace-field.decorator';
+import { WorkspaceIndex } from 'src/engine/twenty-orm/decorators/workspace-index.decorator';
 import { WorkspaceIsNotAuditLogged } from 'src/engine/twenty-orm/decorators/workspace-is-not-audit-logged.decorator';
 import { WorkspaceIsNullable } from 'src/engine/twenty-orm/decorators/workspace-is-nullable.decorator';
 import { WorkspaceIsSystem } from 'src/engine/twenty-orm/decorators/workspace-is-system.decorator';
@@ -31,6 +32,10 @@ import { MessageWorkspaceEntity } from 'src/modules/messaging/common/standard-ob
 })
 @WorkspaceIsNotAuditLogged()
 @WorkspaceIsSystem()
+@WorkspaceIndex(['messageChannelId', 'messageId'], {
+  isUnique: true,
+  indexWhereClause: '"deletedAt" IS NULL',
+})
 export class MessageChannelMessageAssociationWorkspaceEntity extends BaseWorkspaceEntity {
   @WorkspaceField({
     standardId:

packages/twenty-server/src/modules/messaging/message-import-manager/services/messaging-message.service.ts

@@ -65,7 +65,10 @@ export class MessagingMessageService {
             messageExternalId: message.externalId,
             messageThreadExternalId: message.messageThreadExternalId,
           },
-          ['messageChannelId'],
+          {
+            conflictPaths: ['messageChannelId', 'messageId'],
+            indexPredicate: '"deletedAt" IS NULL',
+          },
           transactionManager,
         );
 

packages/twenty-shared/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twenty-shared",
-  "version": "0.41.0-canary",
+  "version": "0.40.7",
   "license": "AGPL-3.0",
   "main": "./dist/index.js",
   "scripts": {

packages/twenty-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twenty-ui",
-  "version": "0.41.0-canary",
+  "version": "0.40.7",
   "type": "module",
   "main": "./src/index.ts",
   "exports": {

packages/twenty-website/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twenty-website",
-  "version": "0.41.0-canary",
+  "version": "0.40.7",
   "private": true,
   "scripts": {
     "nx": "NX_DEFAULT_PROJECT=twenty-website node ../../node_modules/nx/bin/nx.js",