The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Add a Merge with command to record pages (#29155)
Félix Malfait10b62874b628
diff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql b/packages/twenty-client-sdk/src/metadata/generated/schema.graphqlindex 56e5d8442bf..dcd78ed9760 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.graphql+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.graphql@@ -2113,6 +2113,7 @@ enum EngineComponentKey {MARK_AI_CHAT_AS_READMARK_AI_CHAT_AS_UNREADMERGE_MULTIPLE_RECORDS+ MERGE_WITH_RECORDNAVIGATE_TO_NEXT_RECORDNAVIGATE_TO_PREVIOUS_RECORDNAVIGATIONdiff --git a/packages/twenty-client-sdk/src/metadata/generated/schema.ts b/packages/twenty-client-sdk/src/metadata/generated/schema.tsindex 4a65922ba79..deb78072d08 100644--- a/packages/twenty-client-sdk/src/metadata/generated/schema.ts+++ b/packages/twenty-client-sdk/src/metadata/generated/schema.ts@@ -1435,7 +1435,7 @@ export interface EmailsConfiguration {__typename: 'EmailsConfiguration'}-export type EngineComponentKey = 'ACTIVATE_WORKFLOW' | 'ADD_NODE_WORKFLOW' | 'ADD_TO_FAVORITES' | 'ADD_TO_MESSAGE_LIST' | 'ADD_VIEW_TO_MESSAGE_LIST' | 'ASK_AI' | 'ASSIGN_AI_CHAT' | 'CANCEL_DASHBOARD_LAYOUT' | 'CANCEL_MESSAGE_CAMPAIGN' | 'COMPOSE_CAMPAIGN' | 'COMPOSE_EMAIL' | 'CREATE_NEW_RECORD' | 'CREATE_NEW_VIEW' | 'DEACTIVATE_WORKFLOW' | 'DELETE_MULTIPLE_RECORDS' | 'DELETE_RECORDS' | 'DELETE_SINGLE_RECORD' | 'DESTROY_MULTIPLE_RECORDS' | 'DESTROY_RECORDS' | 'DESTROY_SINGLE_RECORD' | 'DISCARD_DRAFT_WORKFLOW' | 'DUPLICATE_DASHBOARD' | 'DUPLICATE_MESSAGE_CAMPAIGN' | 'DUPLICATE_MESSAGE_LIST' | 'DUPLICATE_WORKFLOW' | 'EDIT_DASHBOARD_LAYOUT' | 'EDIT_RECORD_PAGE_LAYOUT' | 'EMAIL_BLOCK_SETTINGS' | 'EMAIL_PAGE_STYLE' | 'EXPORT_FROM_RECORD_INDEX' | 'EXPORT_FROM_RECORD_SHOW' | 'EXPORT_MULTIPLE_RECORDS' | 'EXPORT_RECORDS' | 'EXPORT_VIEW' | 'FRONT_COMPONENT_RENDERER' | 'GO_TO_COMPANIES' | 'GO_TO_DASHBOARDS' | 'GO_TO_NOTES' | 'GO_TO_OPPORTUNITIES' | 'GO_TO_PEOPLE' | 'GO_TO_RUNS' | 'GO_TO_SETTINGS' | 'GO_TO_TASKS' | 'GO_TO_WORKFLOWS' | 'HIDE_DELETED_RECORDS' | 'IMPORT_RECORDS' | 'MARK_AI_CHAT_AS_DONE' | 'MARK_AI_CHAT_AS_READ' | 'MARK_AI_CHAT_AS_UNREAD' | 'MERGE_MULTIPLE_RECORDS' | 'NAVIGATE_TO_NEXT_RECORD' | 'NAVIGATE_TO_PREVIOUS_RECORD' | 'NAVIGATION' | 'NEW_AI_CHAT' | 'REMOVE_FROM_FAVORITES' | 'REOPEN_AI_CHAT' | 'REPLY_TO_EMAIL_THREAD' | 'RESTORE_MULTIPLE_RECORDS' | 'RESTORE_RECORDS' | 'RESTORE_SINGLE_RECORD' | 'RETRY_WORKFLOW_RUN' | 'SAVE_DASHBOARD_LAYOUT' | 'SEARCH_RECORDS' | 'SEARCH_RECORDS_FALLBACK' | 'SEE_ACTIVE_VERSION_WORKFLOW' | 'SEE_DELETED_RECORDS' | 'SEE_RUNS_WORKFLOW' | 'SEE_RUNS_WORKFLOW_VERSION' | 'SEE_VERSIONS_WORKFLOW' | 'SEE_VERSIONS_WORKFLOW_VERSION' | 'SEE_VERSION_WORKFLOW_RUN' | 'SEE_WORKFLOW_WORKFLOW_RUN' | 'SEE_WORKFLOW_WORKFLOW_VERSION' | 'SEND_MESSAGE_CAMPAIGN' | 'SEND_MESSAGE_CAMPAIGN_TEST' | 'SHARE_RECORD' | 'SNOOZE_AI_CHAT' | 'STOP_WORKFLOW_RUN' | 'SUBSCRIBE_TO_AI_CHAT' | 'TEST_WORKFLOW' | 'TIDY_UP_WORKFLOW' | 'TOGGLE_WORKFLOW_VISIBILITY' | 'TRIGGER_WORKFLOW_VERSION' | 'UNSUBSCRIBE_FROM_AI_CHAT' | 'UPDATE_MULTIPLE_RECORDS' | 'USE_AS_DRAFT_WORKFLOW_VERSION' | 'VIEW_PREVIOUS_AI_CHATS'+export type EngineComponentKey = 'ACTIVATE_WORKFLOW' | 'ADD_NODE_WORKFLOW' | 'ADD_TO_FAVORITES' | 'ADD_TO_MESSAGE_LIST' | 'ADD_VIEW_TO_MESSAGE_LIST' | 'ASK_AI' | 'ASSIGN_AI_CHAT' | 'CANCEL_DASHBOARD_LAYOUT' | 'CANCEL_MESSAGE_CAMPAIGN' | 'COMPOSE_CAMPAIGN' | 'COMPOSE_EMAIL' | 'CREATE_NEW_RECORD' | 'CREATE_NEW_VIEW' | 'DEACTIVATE_WORKFLOW' | 'DELETE_MULTIPLE_RECORDS' | 'DELETE_RECORDS' | 'DELETE_SINGLE_RECORD' | 'DESTROY_MULTIPLE_RECORDS' | 'DESTROY_RECORDS' | 'DESTROY_SINGLE_RECORD' | 'DISCARD_DRAFT_WORKFLOW' | 'DUPLICATE_DASHBOARD' | 'DUPLICATE_MESSAGE_CAMPAIGN' | 'DUPLICATE_MESSAGE_LIST' | 'DUPLICATE_WORKFLOW' | 'EDIT_DASHBOARD_LAYOUT' | 'EDIT_RECORD_PAGE_LAYOUT' | 'EMAIL_BLOCK_SETTINGS' | 'EMAIL_PAGE_STYLE' | 'EXPORT_FROM_RECORD_INDEX' | 'EXPORT_FROM_RECORD_SHOW' | 'EXPORT_MULTIPLE_RECORDS' | 'EXPORT_RECORDS' | 'EXPORT_VIEW' | 'FRONT_COMPONENT_RENDERER' | 'GO_TO_COMPANIES' | 'GO_TO_DASHBOARDS' | 'GO_TO_NOTES' | 'GO_TO_OPPORTUNITIES' | 'GO_TO_PEOPLE' | 'GO_TO_RUNS' | 'GO_TO_SETTINGS' | 'GO_TO_TASKS' | 'GO_TO_WORKFLOWS' | 'HIDE_DELETED_RECORDS' | 'IMPORT_RECORDS' | 'MARK_AI_CHAT_AS_DONE' | 'MARK_AI_CHAT_AS_READ' | 'MARK_AI_CHAT_AS_UNREAD' | 'MERGE_MULTIPLE_RECORDS' | 'MERGE_WITH_RECORD' | 'NAVIGATE_TO_NEXT_RECORD' | 'NAVIGATE_TO_PREVIOUS_RECORD' | 'NAVIGATION' | 'NEW_AI_CHAT' | 'REMOVE_FROM_FAVORITES' | 'REOPEN_AI_CHAT' | 'REPLY_TO_EMAIL_THREAD' | 'RESTORE_MULTIPLE_RECORDS' | 'RESTORE_RECORDS' | 'RESTORE_SINGLE_RECORD' | 'RETRY_WORKFLOW_RUN' | 'SAVE_DASHBOARD_LAYOUT' | 'SEARCH_RECORDS' | 'SEARCH_RECORDS_FALLBACK' | 'SEE_ACTIVE_VERSION_WORKFLOW' | 'SEE_DELETED_RECORDS' | 'SEE_RUNS_WORKFLOW' | 'SEE_RUNS_WORKFLOW_VERSION' | 'SEE_VERSIONS_WORKFLOW' | 'SEE_VERSIONS_WORKFLOW_VERSION' | 'SEE_VERSION_WORKFLOW_RUN' | 'SEE_WORKFLOW_WORKFLOW_RUN' | 'SEE_WORKFLOW_WORKFLOW_VERSION' | 'SEND_MESSAGE_CAMPAIGN' | 'SEND_MESSAGE_CAMPAIGN_TEST' | 'SHARE_RECORD' | 'SNOOZE_AI_CHAT' | 'STOP_WORKFLOW_RUN' | 'SUBSCRIBE_TO_AI_CHAT' | 'TEST_WORKFLOW' | 'TIDY_UP_WORKFLOW' | 'TOGGLE_WORKFLOW_VISIBILITY' | 'TRIGGER_WORKFLOW_VERSION' | 'UNSUBSCRIBE_FROM_AI_CHAT' | 'UPDATE_MULTIPLE_RECORDS' | 'USE_AS_DRAFT_WORKFLOW_VERSION' | 'VIEW_PREVIOUS_AI_CHATS'export interface EnqueueJobResult {enqueued: Scalars['Boolean']@@ -12201,6 +12201,7 @@ export const enumEngineComponentKey = {MARK_AI_CHAT_AS_READ: 'MARK_AI_CHAT_AS_READ' as const,MARK_AI_CHAT_AS_UNREAD: 'MARK_AI_CHAT_AS_UNREAD' as const,MERGE_MULTIPLE_RECORDS: 'MERGE_MULTIPLE_RECORDS' as const,+ MERGE_WITH_RECORD: 'MERGE_WITH_RECORD' as const,NAVIGATE_TO_NEXT_RECORD: 'NAVIGATE_TO_NEXT_RECORD' as const,NAVIGATE_TO_PREVIOUS_RECORD: 'NAVIGATE_TO_PREVIOUS_RECORD' as const,NAVIGATION: 'NAVIGATION' as const,diff --git a/packages/twenty-front/src/generated-metadata/schema.ts b/packages/twenty-front/src/generated-metadata/schema.tsindex 6a2b3a822b3..478136e3e06 100644--- a/packages/twenty-front/src/generated-metadata/schema.ts+++ b/packages/twenty-front/src/generated-metadata/schema.ts@@ -2238,6 +2238,7 @@ export enum EngineComponentKey {MARK_AI_CHAT_AS_READ = 'MARK_AI_CHAT_AS_READ',MARK_AI_CHAT_AS_UNREAD = 'MARK_AI_CHAT_AS_UNREAD',MERGE_MULTIPLE_RECORDS = 'MERGE_MULTIPLE_RECORDS',+ MERGE_WITH_RECORD = 'MERGE_WITH_RECORD',NAVIGATE_TO_NEXT_RECORD = 'NAVIGATE_TO_NEXT_RECORD',NAVIGATE_TO_PREVIOUS_RECORD = 'NAVIGATE_TO_PREVIOUS_RECORD',NAVIGATION = 'NAVIGATION',diff --git a/packages/twenty-front/src/modules/command-menu-item/constants/CommandMenuItemSectionByEngineComponentKey.ts b/packages/twenty-front/src/modules/command-menu-item/constants/CommandMenuItemSectionByEngineComponentKey.tsindex e42bf9ebe42..a31f6256125 100644--- a/packages/twenty-front/src/modules/command-menu-item/constants/CommandMenuItemSectionByEngineComponentKey.ts+++ b/packages/twenty-front/src/modules/command-menu-item/constants/CommandMenuItemSectionByEngineComponentKey.ts@@ -11,6 +11,7 @@ export const COMMAND_MENU_ITEM_SECTION_BY_ENGINE_COMPONENT_KEY = {[EngineComponentKey.EXPORT_RECORDS]: 'SELECTION',[EngineComponentKey.UPDATE_MULTIPLE_RECORDS]: 'SELECTION',[EngineComponentKey.MERGE_MULTIPLE_RECORDS]: 'SELECTION',+ [EngineComponentKey.MERGE_WITH_RECORD]: 'SELECTION',[EngineComponentKey.REPLY_TO_EMAIL_THREAD]: 'SELECTION',[EngineComponentKey.SHARE_RECORD]: 'SELECTION',[EngineComponentKey.MARK_AI_CHAT_AS_READ]: 'SELECTION',diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/constants/EngineComponentKeyHeadlessComponentMap.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/constants/EngineComponentKeyHeadlessComponentMap.tsxindex d47b6f9102c..33db8d0e38e 100644--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/constants/EngineComponentKeyHeadlessComponentMap.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/constants/EngineComponentKeyHeadlessComponentMap.tsx@@ -27,6 +27,7 @@ import { HideDeletedRecordsNoSelectionRecordCommand } from '@/command-menu-item/import { ImportRecordsNoSelectionRecordCommand } from '@/command-menu-item/engine-command/record/no-selection/components/ImportRecordsNoSelectionRecordCommand';import { SeeDeletedRecordsNoSelectionRecordCommand } from '@/command-menu-item/engine-command/record/no-selection/components/SeeDeletedRecordsNoSelectionRecordCommand';import { AddToFavoritesCommand } from '@/command-menu-item/engine-command/record/components/AddToFavoritesCommand';+import { MergeWithRecordSingleRecordCommand } from '@/command-menu-item/engine-command/record/single-record/components/MergeWithRecordSingleRecordCommand';import { NavigateToNextRecordSingleRecordCommand } from '@/command-menu-item/engine-command/record/single-record/components/NavigateToNextRecordSingleRecordCommand';import { NavigateToPreviousRecordSingleRecordCommand } from '@/command-menu-item/engine-command/record/single-record/components/NavigateToPreviousRecordSingleRecordCommand';import { RemoveFromFavoritesCommand } from '@/command-menu-item/engine-command/record/components/RemoveFromFavoritesCommand';@@ -77,6 +78,9 @@ export const ENGINE_COMPONENT_KEY_COMPONENT_MAP: Record<[EngineComponentKey.ADD_TO_FAVORITES]: <AddToFavoritesCommand />,[EngineComponentKey.REMOVE_FROM_FAVORITES]: <RemoveFromFavoritesCommand />,[EngineComponentKey.MERGE_MULTIPLE_RECORDS]: <MergeMultipleRecordsCommand />,+ [EngineComponentKey.MERGE_WITH_RECORD]: (+ <MergeWithRecordSingleRecordCommand />+ ),[EngineComponentKey.DUPLICATE_DASHBOARD]: (<DuplicateDashboardSingleRecordCommand />),diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/multiple-records/components/MergeMultipleRecordsCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/multiple-records/components/MergeMultipleRecordsCommand.tsxindex c17925f9094..3caea3ac36c 100644--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/multiple-records/components/MergeMultipleRecordsCommand.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/multiple-records/components/MergeMultipleRecordsCommand.tsx@@ -21,11 +21,10 @@ export const MergeMultipleRecordsCommand = () => {const { openMergeRecordsPageInSidePanel } =useOpenMergeRecordsPageInSidePanel({objectNameSingular: objectMetadataItem.nameSingular,- objectRecordIds: selectedRecordIds,});const handleExecute = () => {- openMergeRecordsPageInSidePanel();+ openMergeRecordsPageInSidePanel(selectedRecordIds);};return <HeadlessEngineCommandWrapperEffect execute={handleExecute} />;diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/components/MergeWithRecordSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/components/MergeWithRecordSingleRecordCommand.tsxnew file mode 100644index 00000000000..85b35a09ef7--- /dev/null+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/components/MergeWithRecordSingleRecordCommand.tsx@@ -0,0 +1,27 @@+import { isDefined } from 'twenty-shared/utils';+import { doNotTranslate } from 'twenty-shared/i18n';++import { HeadlessEngineCommandWrapperEffect } from '@/command-menu-item/engine-command/components/HeadlessEngineCommandWrapperEffect';+import { useHeadlessCommandContextApi } from '@/command-menu-item/engine-command/hooks/useHeadlessCommandContextApi';+import { useOpenMergeWithRecordInSidePanel } from '@/side-panel/hooks/useOpenMergeWithRecordInSidePanel';++export const MergeWithRecordSingleRecordCommand = () => {+ const { objectMetadataItem, selectedRecords } =+ useHeadlessCommandContextApi();+ const { openMergeWithRecordInSidePanel } =+ useOpenMergeWithRecordInSidePanel();++ if (!isDefined(objectMetadataItem) || selectedRecords.length !== 1) {+ throw new Error(+ doNotTranslate('Merging with another record needs exactly one record'),+ );+ }++ const handleExecute = () =>+ openMergeWithRecordInSidePanel({+ objectNameSingular: objectMetadataItem.nameSingular,+ recordId: selectedRecords[0].id,+ });++ return <HeadlessEngineCommandWrapperEffect execute={handleExecute} />;+};diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsxindex ecc2ee0ab81..6eeb396707f 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelPageInfo.tsx@@ -84,6 +84,7 @@ export const SidePanelPageInfo = ({ pageChip }: SidePanelPageInfoProps) => {SidePanelPages.EmailBlockStyle,SidePanelPages.AddToMessageList,SidePanelPages.ShareRecord,+ SidePanelPages.MergeWithRecord,].includes(pageChip.page.page): false;diff --git a/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx b/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsxindex c4216d18ba4..e2a2c7e5e90 100644--- a/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx+++ b/packages/twenty-front/src/modules/side-panel/constants/SidePanelPagesConfig.tsx@@ -31,6 +31,7 @@ import { SidePanelPageLayoutRecordPageWidgetTypeSelect } from '@/side-panel/pageimport { SidePanelPageLayoutTabSettings } from '@/side-panel/pages/page-layout/components/SidePanelPageLayoutTabSettings';import { SidePanelPageLayoutWidgetSettings } from '@/side-panel/pages/page-layout/components/SidePanelPageLayoutWidgetSettings';import { SidePanelMergeRecordPage } from '@/side-panel/pages/record-page/components/SidePanelMergeRecordPage';+import { SidePanelMergeWithRecordPage } from '@/side-panel/pages/merge-with-record/components/SidePanelMergeWithRecordPage';import { SidePanelUpdateMultipleRecords } from '@/side-panel/pages/record-page/components/SidePanelUpdateMultipleRecords';import { SidePanelEditRichTextPage } from '@/side-panel/pages/rich-text-page/components/SidePanelEditRichTextPage';import { SidePanelSearchRecordsPage } from '@/side-panel/pages/search/components/SidePanelSearchRecordsPage';@@ -51,6 +52,7 @@ export const SIDE_PANEL_PAGES_CONFIG = new Map<>([[SidePanelPages.CommandMenuDisplay, <SidePanelCommandMenuItemDisplayPage />],[SidePanelPages.MergeRecords, <SidePanelMergeRecordPage />],+ [SidePanelPages.MergeWithRecord, <SidePanelMergeWithRecordPage />],[SidePanelPages.UpdateRecords, <SidePanelUpdateMultipleRecords />],[SidePanelPages.EditRichText, <SidePanelEditRichTextPage />],[diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenMergeRecordsPageInSidePanel.tsx b/packages/twenty-front/src/modules/side-panel/hooks/useOpenMergeRecordsPageInSidePanel.tsxindex fb6ab94d344..1ae3e4cf493 100644--- a/packages/twenty-front/src/modules/side-panel/hooks/useOpenMergeRecordsPageInSidePanel.tsx+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenMergeRecordsPageInSidePanel.tsx@@ -1,28 +1,34 @@import { useSidePanelUpdateNavigationMorphItemsByPage } from '@/side-panel/hooks/useSidePanelUpdateNavigationMorphItemsByPage';import { useNavigateSidePanel } from '@/side-panel/hooks/useNavigateSidePanel';import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';+import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';+import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';-import { useLazyFindManyRecords } from '@/object-record/hooks/useLazyFindManyRecords';+import { getRecordsFromRecordConnection } from '@/object-record/cache/utils/getRecordsFromRecordConnection';+import { type RecordGqlOperationFindManyResult } from '@/object-record/graphql/types/RecordGqlOperationFindManyResult';+import { useFindManyRecordsQuery } from '@/object-record/hooks/useFindManyRecordsQuery';import { mergeSettingsState } from '@/object-record/record-merge/states/mergeSettingsState';import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';import { SidePanelPages } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';import { msg, t } from '@lingui/core/macro';import { useCallback } from 'react';+import { useToast } from 'twenty-ui/components/feedback';import { IconArrowMerge } from 'twenty-ui/icon';import { v4 } from 'uuid';import { useStore } from 'jotai';type UseOpenMergeRecordsPageInSidePanelProps = {objectNameSingular: string;- objectRecordIds: string[];};export const useOpenMergeRecordsPageInSidePanel = ({objectNameSingular,- objectRecordIds,}: UseOpenMergeRecordsPageInSidePanelProps) => {const store = useStore();+ const apolloCoreClient = useApolloCoreClient();+ const { enqueueToast } = useToast();const { objectMetadataItem } = useObjectMetadataItem({objectNameSingular,});@@ -33,50 +39,69 @@ export const useOpenMergeRecordsPageInSidePanel = ({const { upsertRecordsInStore } = useUpsertRecordsInStore();- const { findManyRecordsLazy } = useLazyFindManyRecords({+ const { findManyRecordsQuery } = useFindManyRecordsQuery({objectNameSingular,- filter: {- id: {- in: objectRecordIds,- },- },});- const openMergeRecordsPageInSidePanel = useCallback(async () => {- const pageId = v4();+ const openMergeRecordsPageInSidePanel = useCallback(+ async (objectRecordIds: string[]) => {+ try {+ const { data } =+ await apolloCoreClient.query<RecordGqlOperationFindManyResult>({+ query: findManyRecordsQuery,+ variables: { filter: { id: { in: objectRecordIds } } },+ });+ const recordConnection = data?.[objectMetadataItem.namePlural];- store.set(- contextStoreCurrentObjectMetadataItemIdComponentState.atomFamily({- instanceId: pageId,- }),- objectMetadataItem.id,- );+ if (isDefined(recordConnection)) {+ upsertRecordsInStore({+ partialRecords: getRecordsFromRecordConnection({+ recordConnection,+ }),+ });+ }+ } catch (error) {+ enqueueToast(getToastOptionsFromError({ error }));++ return;+ }++ const pageId = v4();- store.set(mergeSettingsState.atom, { conflictPriorityIndex: 0 });+ store.set(+ contextStoreCurrentObjectMetadataItemIdComponentState.atomFamily({+ instanceId: pageId,+ }),+ objectMetadataItem.id,+ );- await updateSidePanelNavigationMorphItemsByPage({- pageId,- objectMetadataId: objectMetadataItem.id,- objectRecordIds,- });- const { records } = await findManyRecordsLazy();- upsertRecordsInStore({ partialRecords: records ?? [] });+ store.set(mergeSettingsState.atom, { conflictPriorityIndex: 0 });- navigateSidePanel({- page: SidePanelPages.MergeRecords,- pageTitle: t(msg`Merge records`),- pageIcon: IconArrowMerge,- pageId,- });- }, [- objectMetadataItem.id,- objectRecordIds,- findManyRecordsLazy,- upsertRecordsInStore,- navigateSidePanel,- updateSidePanelNavigationMorphItemsByPage,- store,- ]);+ await updateSidePanelNavigationMorphItemsByPage({+ pageId,+ objectMetadataId: objectMetadataItem.id,+ objectRecordIds,+ });++ navigateSidePanel({+ page: SidePanelPages.MergeRecords,+ pageTitle: t(msg`Merge records`),+ pageIcon: IconArrowMerge,+ pageId,+ });+ },+ [+ objectMetadataItem.id,+ objectMetadataItem.namePlural,+ apolloCoreClient,+ enqueueToast,+ findManyRecordsQuery,+ upsertRecordsInStore,+ navigateSidePanel,+ updateSidePanelNavigationMorphItemsByPage,+ store,+ ],+ );return {openMergeRecordsPageInSidePanel,diff --git a/packages/twenty-front/src/modules/side-panel/hooks/useOpenMergeWithRecordInSidePanel.ts b/packages/twenty-front/src/modules/side-panel/hooks/useOpenMergeWithRecordInSidePanel.tsnew file mode 100644index 00000000000..0896f4dd842--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/hooks/useOpenMergeWithRecordInSidePanel.ts@@ -0,0 +1,37 @@+import { useLingui } from '@lingui/react/macro';+import { useStore } from 'jotai';+import { useCallback } from 'react';+import { SidePanelPages } from 'twenty-shared/types';+import { IconArrowMerge } from 'twenty-ui/icon';+import { v4 } from 'uuid';++import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';+import { mergeWithRecordSourceComponentState } from '@/side-panel/pages/merge-with-record/states/mergeWithRecordSourceComponentState';+import { type MergeWithRecordSource } from '@/side-panel/pages/merge-with-record/types/MergeWithRecordSource';++export const useOpenMergeWithRecordInSidePanel = () => {+ const { t } = useLingui();+ const store = useStore();+ const { navigateSidePanelMenu } = useSidePanelMenu();++ const openMergeWithRecordInSidePanel = useCallback(+ (mergeWithRecordSource: MergeWithRecordSource) => {+ const pageId = v4();++ store.set(+ mergeWithRecordSourceComponentState.atomFamily({ instanceId: pageId }),+ mergeWithRecordSource,+ );++ navigateSidePanelMenu({+ page: SidePanelPages.MergeWithRecord,+ pageTitle: t`Merge with`,+ pageIcon: IconArrowMerge,+ pageId,+ });+ },+ [navigateSidePanelMenu, store, t],+ );++ return { openMergeWithRecordInSidePanel };+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/merge-with-record/components/SidePanelMergeWithRecordList.tsx b/packages/twenty-front/src/modules/side-panel/pages/merge-with-record/components/SidePanelMergeWithRecordList.tsxnew file mode 100644index 00000000000..6a8f03d7ed0--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/merge-with-record/components/SidePanelMergeWithRecordList.tsx@@ -0,0 +1,104 @@+import { styled } from '@linaria/react';+import { useState } from 'react';+import { Avatar } from 'twenty-ui/primitives/data-display';+import { themeCssVariables } from 'twenty-ui/theme';+import { useDebounce } from 'use-debounce';++import { ToastOnQueryErrorEffect } from '@/apollo/components/ToastOnQueryErrorEffect';+import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';+import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';+import { getAvatarShape } from '@/object-metadata/utils/getAvatarShape';+import { DEFAULT_SEARCH_REQUEST_LIMIT } from '@/object-record/constants/DefaultSearchRequestLimit';+import { useObjectRecordSearchRecords } from '@/object-record/hooks/useObjectRecordSearchRecords';+import { SidePanelList } from '@/side-panel/components/SidePanelList';+import { useOpenMergeRecordsPageInSidePanel } from '@/side-panel/hooks/useOpenMergeRecordsPageInSidePanel';+import { type MergeWithRecordSource } from '@/side-panel/pages/merge-with-record/types/MergeWithRecordSource';+import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';+import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';+import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';++const StyledSearchContainer = styled.div`+ border-bottom: 1px solid ${themeCssVariables.border.color.light};+ padding: 0 ${themeCssVariables.spacing[2]};+`;++type SidePanelMergeWithRecordListProps = MergeWithRecordSource;++export const SidePanelMergeWithRecordList = ({+ objectNameSingular,+ recordId,+}: SidePanelMergeWithRecordListProps) => {+ const [search, setSearch] = useState('');+ const [debouncedSearch] = useDebounce(search.trim(), 300);+ const { objectMetadataItem } = useObjectMetadataItem({+ objectNameSingular,+ });++ const { searchRecords, loading, error } = useObjectRecordSearchRecords({+ objectNameSingulars: [objectNameSingular],+ searchInput: debouncedSearch,+ filter: { not: { id: { in: [recordId] } } },+ limit: DEFAULT_SEARCH_REQUEST_LIMIT,+ });++ const { openMergeRecordsPageInSidePanel } =+ useOpenMergeRecordsPageInSidePanel({ objectNameSingular });++ // A double click would otherwise push two merge pages while the records load+ const [isOpeningMerge, setIsOpeningMerge] = useState(false);++ const handleSelect = async (otherRecordId: string) => {+ if (isOpeningMerge) {+ return;+ }++ setIsOpeningMerge(true);++ try {+ await openMergeRecordsPageInSidePanel([recordId, otherRecordId]);+ } finally {+ setIsOpeningMerge(false);+ }+ };++ return (+ <>+ <ToastOnQueryErrorEffect error={error} />+ <StyledSearchContainer>+ <DropdownMenuSearchInput+ value={search}+ onChange={(event) => setSearch(event.target.value)}+ />+ </StyledSearchContainer>+ <SidePanelList+ selectableItemIds={searchRecords.map(+ (searchRecord) => searchRecord.recordId,+ )}+ loading={loading}+ noResults={searchRecords.length === 0}+ >+ {searchRecords.map((searchRecord) => (+ <SelectableListItem+ key={searchRecord.recordId}+ itemId={searchRecord.recordId}+ onEnter={() => handleSelect(searchRecord.recordId)}+ >+ <CommandMenuItem+ id={searchRecord.recordId}+ label={searchRecord.label}+ onClick={() => handleSelect(searchRecord.recordId)}+ LeftComponent={+ <Avatar+ shape={getAvatarShape(objectMetadataItem)}+ src={getAbsoluteImageUrl(searchRecord.imageUrl)}+ colorSeed={searchRecord.recordId}+ name={searchRecord.label}+ />+ }+ />+ </SelectableListItem>+ ))}+ </SidePanelList>+ </>+ );+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/merge-with-record/components/SidePanelMergeWithRecordPage.tsx b/packages/twenty-front/src/modules/side-panel/pages/merge-with-record/components/SidePanelMergeWithRecordPage.tsxnew file mode 100644index 00000000000..2bc142ce21d--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/merge-with-record/components/SidePanelMergeWithRecordPage.tsx@@ -0,0 +1,22 @@+import { isDefined } from 'twenty-shared/utils';++import { SidePanelMergeWithRecordList } from '@/side-panel/pages/merge-with-record/components/SidePanelMergeWithRecordList';+import { mergeWithRecordSourceComponentState } from '@/side-panel/pages/merge-with-record/states/mergeWithRecordSourceComponentState';+import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';++export const SidePanelMergeWithRecordPage = () => {+ const mergeWithRecordSource = useAtomComponentStateValue(+ mergeWithRecordSourceComponentState,+ );++ if (!isDefined(mergeWithRecordSource)) {+ return null;+ }++ return (+ <SidePanelMergeWithRecordList+ objectNameSingular={mergeWithRecordSource.objectNameSingular}+ recordId={mergeWithRecordSource.recordId}+ />+ );+};diff --git a/packages/twenty-front/src/modules/side-panel/pages/merge-with-record/components/__tests__/SidePanelMergeWithRecordPage.test.tsx b/packages/twenty-front/src/modules/side-panel/pages/merge-with-record/components/__tests__/SidePanelMergeWithRecordPage.test.tsxnew file mode 100644index 00000000000..71e87d43688--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/merge-with-record/components/__tests__/SidePanelMergeWithRecordPage.test.tsx@@ -0,0 +1,119 @@+import { i18n } from '@lingui/core';+import { I18nProvider } from '@lingui/react';+import { render, screen } from '@testing-library/react';+import userEvent from '@testing-library/user-event';+import { Provider as JotaiProvider } from 'jotai';+import { type ReactNode } from 'react';+import { MemoryRouter } from 'react-router-dom';+import { SOURCE_LOCALE } from 'twenty-shared/translations';+import { ToastProvider } from 'twenty-ui/components/feedback';++import { SidePanelMergeWithRecordPage } from '@/side-panel/pages/merge-with-record/components/SidePanelMergeWithRecordPage';+import { mergeWithRecordSourceComponentState } from '@/side-panel/pages/merge-with-record/states/mergeWithRecordSourceComponentState';+import { SidePanelPageComponentInstanceContext } from '@/side-panel/states/contexts/SidePanelPageComponentInstanceContext';+import {+ jotaiStore,+ resetJotaiStore,+} from '@/ui/utilities/state/jotai/jotaiStore';+import { messages } from '~/locales/generated/en';+import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';++i18n.load({ [SOURCE_LOCALE]: messages });+i18n.activate(SOURCE_LOCALE);++const companyObjectMetadataItem = getMockObjectMetadataItemOrThrow('company');+const CURRENT_RECORD_ID = 'acme-1';+const PICKED_RECORD_ID = 'acme-2';++const openMergeRecordsPageInSidePanel = jest.fn();++jest.mock('@/side-panel/hooks/useOpenMergeRecordsPageInSidePanel', () => ({+ useOpenMergeRecordsPageInSidePanel: () => ({+ openMergeRecordsPageInSidePanel,+ }),+}));++jest.mock('@/object-record/hooks/useObjectRecordSearchRecords', () => ({+ useObjectRecordSearchRecords: () => ({+ searchRecords: [+ {+ recordId: PICKED_RECORD_ID,+ objectNameSingular: companyObjectMetadataItem.nameSingular,+ label: 'Acme Inc',+ imageUrl: null,+ },+ ],+ loading: false,+ error: undefined,+ }),+}));++jest.mock('@/object-metadata/hooks/useObjectMetadataItem', () => ({+ useObjectMetadataItem: () => ({+ objectMetadataItem: companyObjectMetadataItem,+ }),+}));++const PAGE_ID = 'merge-with-page';++const Wrapper = ({ children }: { children: ReactNode }) => (+ <JotaiProvider store={jotaiStore}>+ <I18nProvider i18n={i18n}>+ <SidePanelPageComponentInstanceContext.Provider+ value={{ instanceId: PAGE_ID }}+ >+ <ToastProvider>+ <MemoryRouter>{children}</MemoryRouter>+ </ToastProvider>+ </SidePanelPageComponentInstanceContext.Provider>+ </I18nProvider>+ </JotaiProvider>+);++const setMergeWithRecordSource = () =>+ jotaiStore.set(+ mergeWithRecordSourceComponentState.atomFamily({ instanceId: PAGE_ID }),+ {+ objectNameSingular: companyObjectMetadataItem.nameSingular,+ recordId: CURRENT_RECORD_ID,+ },+ );++describe('SidePanelMergeWithRecordPage', () => {+ beforeEach(() => {+ jest.clearAllMocks();+ resetJotaiStore();+ });++ it('opens the merge of the current record with the picked one', async () => {+ setMergeWithRecordSource();++ render(<SidePanelMergeWithRecordPage />, { wrapper: Wrapper });++ await userEvent.click(screen.getByText('Acme Inc'));++ expect(openMergeRecordsPageInSidePanel).toHaveBeenCalledWith([+ CURRENT_RECORD_ID,+ PICKED_RECORD_ID,+ ]);+ });++ it('opens a single merge when the record is clicked twice while loading', async () => {+ openMergeRecordsPageInSidePanel.mockReturnValue(new Promise(() => {}));+ setMergeWithRecordSource();++ render(<SidePanelMergeWithRecordPage />, { wrapper: Wrapper });++ await userEvent.dblClick(screen.getByText('Acme Inc'));++ expect(openMergeRecordsPageInSidePanel).toHaveBeenCalledTimes(1);+ });++ it('renders nothing without a record to merge from', () => {+ const { container } = render(<SidePanelMergeWithRecordPage />, {+ wrapper: Wrapper,+ });++ expect(container).toBeEmptyDOMElement();+ });+});diff --git a/packages/twenty-front/src/modules/side-panel/pages/merge-with-record/states/mergeWithRecordSourceComponentState.ts b/packages/twenty-front/src/modules/side-panel/pages/merge-with-record/states/mergeWithRecordSourceComponentState.tsnew file mode 100644index 00000000000..f9b23eb1f8e--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/merge-with-record/states/mergeWithRecordSourceComponentState.ts@@ -0,0 +1,10 @@+import { type MergeWithRecordSource } from '@/side-panel/pages/merge-with-record/types/MergeWithRecordSource';+import { SidePanelPageComponentInstanceContext } from '@/side-panel/states/contexts/SidePanelPageComponentInstanceContext';+import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';++export const mergeWithRecordSourceComponentState =+ createAtomComponentState<MergeWithRecordSource | null>({+ key: 'side-panel/merge-with-record-source',+ defaultValue: null,+ componentInstanceContext: SidePanelPageComponentInstanceContext,+ });diff --git a/packages/twenty-front/src/modules/side-panel/pages/merge-with-record/types/MergeWithRecordSource.ts b/packages/twenty-front/src/modules/side-panel/pages/merge-with-record/types/MergeWithRecordSource.tsnew file mode 100644index 00000000000..517dad78bbb--- /dev/null+++ b/packages/twenty-front/src/modules/side-panel/pages/merge-with-record/types/MergeWithRecordSource.ts@@ -0,0 +1,4 @@+export type MergeWithRecordSource = {+ objectNameSingular: string;+ recordId: string;+};diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-upgrade-version-command.module.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-upgrade-version-command.module.tsindex 11b8d5efa3f..5c96b9792bc 100644--- a/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-upgrade-version-command.module.ts+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-upgrade-version-command.module.ts@@ -1,6 +1,7 @@import { Module } from '@nestjs/common';import { WorkspaceIteratorModule } from 'src/database/commands/command-runners/workspace-iterator.module';+import { AddMergeWithRecordCommandMenuItemCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793265618567-add-merge-with-record-command-menu-item.command';import { UpdateCrmHygieneSkillMergeGuidanceCommand } from 'src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793206127866-update-crm-hygiene-skill-merge-guidance.command';import { ApplicationModule } from 'src/engine/core-modules/application/application.module';import { WorkspaceCacheModule } from 'src/engine/workspace-cache/workspace-cache.module';@@ -13,6 +14,9 @@ import { WorkspaceMigrationModule } from 'src/engine/workspace-manager/workspaceWorkspaceIteratorModule,WorkspaceMigrationModule,],- providers: [UpdateCrmHygieneSkillMergeGuidanceCommand],+ providers: [+ AddMergeWithRecordCommandMenuItemCommand,+ UpdateCrmHygieneSkillMergeGuidanceCommand,+ ],})export class V2_54_UpgradeVersionCommandModule {}diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793265618567-add-merge-with-record-command-menu-item.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793265618567-add-merge-with-record-command-menu-item.command.tsnew file mode 100644index 00000000000..d7a038eb6bd--- /dev/null+++ b/packages/twenty-server/src/database/commands/upgrade-version-command/2-54/2-54-workspace-command-1793265618567-add-merge-with-record-command-menu-item.command.ts@@ -0,0 +1,82 @@+import { Command } from 'nest-commander';+import { TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER } from 'twenty-shared/application';++import { ProvisionedWorkspaceCommandRunner } from 'src/database/commands/command-runners/provisioned-workspace.command-runner';+import { WorkspaceIteratorService } from 'src/database/commands/command-runners/workspace-iterator.service';+import { type RunOnWorkspaceArgs } from 'src/database/commands/command-runners/workspace.command-runner';+import { buildMissingStandardCommandMenuItemsToCreate } from 'src/database/commands/upgrade-version-command/2-39/utils/build-missing-standard-command-menu-items-to-create.util';+import { RegisteredWorkspaceCommand } from 'src/engine/core-modules/upgrade/decorators/registered-workspace-command.decorator';+import { WorkspaceCacheService } from 'src/engine/workspace-cache/services/workspace-cache.service';+import { WorkspaceMigrationBuilderException } from 'src/engine/workspace-manager/workspace-migration/exceptions/workspace-migration-builder-exception';+import { WorkspaceMigrationValidateBuildAndRunService } from 'src/engine/workspace-manager/workspace-migration/services/workspace-migration-validate-build-and-run-service';++@RegisteredWorkspaceCommand('2.54.0', 1793265618567)+@Command({+ name: 'upgrade:2-54:add-merge-with-record-command-menu-item',+ description:+ 'Add the record page Merge with command to workspaces that predate it',+})+export class AddMergeWithRecordCommandMenuItemCommand extends ProvisionedWorkspaceCommandRunner {+ constructor(+ protected readonly workspaceIteratorService: WorkspaceIteratorService,+ private readonly workspaceCacheService: WorkspaceCacheService,+ private readonly workspaceMigrationValidateBuildAndRunService: WorkspaceMigrationValidateBuildAndRunService,+ ) {+ super(workspaceIteratorService);+ }++ override async runOnWorkspace({+ workspaceId,+ options,+ }: RunOnWorkspaceArgs): Promise<void> {+ const { flatCommandMenuItemMaps, flatObjectMetadataMaps } =+ await this.workspaceCacheService.getOrRecompute(workspaceId, [+ 'flatCommandMenuItemMaps',+ 'flatObjectMetadataMaps',+ ]);++ const commandMenuItemsToCreate =+ buildMissingStandardCommandMenuItemsToCreate({+ commandMenuItemNames: ['mergeWithRecord'],+ flatCommandMenuItemByUniversalIdentifier:+ flatCommandMenuItemMaps.byUniversalIdentifier,+ flatObjectMetadataMaps,+ workspaceId,+ now: new Date().toISOString(),+ });++ if (commandMenuItemsToCreate.length === 0) {+ return;+ }++ this.logger.log(+ `${options.dryRun ? '[DRY RUN] ' : ''}Workspace ${workspaceId}: creating the Merge with command menu item`,+ );++ if (options.dryRun) {+ return;+ }++ const result =+ await this.workspaceMigrationValidateBuildAndRunService.validateBuildAndRunLegacyWorkspaceMigration(+ {+ shouldDeferActions: false,+ workspaceId,+ isSystemBuild: true,+ applicationUniversalIdentifier:+ TWENTY_STANDARD_APPLICATION_UNIVERSAL_IDENTIFIER,+ allFlatEntityOperationByMetadataName: {+ commandMenuItem: {+ flatEntityToCreate: commandMenuItemsToCreate,+ flatEntityToDelete: [],+ flatEntityToUpdate: [],+ },+ },+ },+ );++ if (result.status === 'fail') {+ throw new WorkspaceMigrationBuilderException(result);+ }+ }+}diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.tsindex 0a97e7955c5..d1d74c0c886 100644--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-merge-many-query-runner.service.ts@@ -621,7 +621,7 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServrolePermissionConfig,);- await objectRepository.runMutation({+ const deletedRecords = await objectRepository.runMutation({selectQueryBuilder: objectRepository.createQueryBuilder(alias).where({ id: In(idsToDelete) }),@@ -630,6 +630,17 @@ export class CommonMergeManyQueryRunnerService extends CommonBaseQueryRunnerServcolumnsToReturn,});+ // Row-level permissions filter the delete, so a record the role can read but not delete is skipped silently+ if (deletedRecords.length !== idsToDelete.length) {+ throw new CommonQueryRunnerException(+ 'Some records to merge cannot be deleted with the current role',+ CommonQueryRunnerExceptionCode.INVALID_QUERY_INPUT,+ {+ userFriendlyMessage: msg`Your role cannot delete some of these records, so they cannot be merged.`,+ },+ );+ }+const [resolvedMergedData] = await this.resolveNestedRelations({records: [mergedData],queryRunnerContext,diff --git a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum.ts b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum.tsindex b424a810888..62f788f3e5e 100644--- a/packages/twenty-server/src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum.ts+++ b/packages/twenty-server/src/engine/metadata-modules/command-menu-item/enums/engine-component-key.enum.ts@@ -12,6 +12,7 @@ export enum EngineComponentKey {EXPORT_RECORDS = 'EXPORT_RECORDS',UPDATE_MULTIPLE_RECORDS = 'UPDATE_MULTIPLE_RECORDS',MERGE_MULTIPLE_RECORDS = 'MERGE_MULTIPLE_RECORDS',+ MERGE_WITH_RECORD = 'MERGE_WITH_RECORD',IMPORT_RECORDS = 'IMPORT_RECORDS',EXPORT_VIEW = 'EXPORT_VIEW',SEE_DELETED_RECORDS = 'SEE_DELETED_RECORDS',diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.tsindex ed027f932c7..e9fe71ed6c7 100644--- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts+++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/constants/standard-command-menu-item.constant.ts@@ -241,6 +241,28 @@ export const STANDARD_COMMAND_MENU_ITEMS = {engineComponentKey: EngineComponentKey.MERGE_MULTIPLE_RECORDS,hotKeys: null,},+ mergeWithRecord: {+ universalIdentifier: 'eb8acbd6-b285-466b-a172-7a643d8d5e3f',+ label: i18nLabel(+ msg({+ message: `Merge with Another {objectLabelSingular}`,+ context: 'commandMenuItem.label',+ }),+ ),+ icon: 'IconArrowMerge',+ isPinned: false,+ position: 12,+ shortLabel: i18nLabel(+ msg({ message: `Merge`, context: 'commandMenuItem.shortLabel' }),+ ),+ availabilityType: CommandMenuItemAvailabilityType.RECORD_SELECTION,+ conditionalAvailabilityExpression:+ 'pageType == "RECORD_PAGE" and numberOfSelectedRecords == 1 and noneDefined(selectedRecords, "deletedAt") and not objectMetadataItem.isSystem and objectMetadataItem.nameSingular != "workflow" and objectMetadataItem.nameSingular != "dashboard" and objectPermissions.canUpdateObjectRecords and objectPermissions.canDestroyObjectRecords and noneEquals(selectedRecords, "recordPermissions.canUpdate", false) and noneEquals(selectedRecords, "recordPermissions.canDelete", false)',+ availabilityObjectMetadataUniversalIdentifier: null,+ frontComponentUniversalIdentifier: null,+ engineComponentKey: EngineComponentKey.MERGE_WITH_RECORD,+ hotKeys: null,+ },importRecords: {universalIdentifier: 'a2dc9de7-4798-422e-bb55-bfad7b9bdbe8',label: i18nLabel(diff --git a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.ts b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.tsindex 5a50905b800..6c3d9ef2c36 100644--- a/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.ts+++ b/packages/twenty-server/test/integration/graphql/suites/object-records-permissions/record-sharing-beyond-role.integration-spec.ts@@ -15,6 +15,7 @@ import { deleteOneOperationFactory } from 'test/integration/graphql/utils/deleteimport { destroyManyOperationFactory } from 'test/integration/graphql/utils/destroy-many-operation-factory.util';import { findManyOperationFactory } from 'test/integration/graphql/utils/find-many-operation-factory.util';import { makeGraphqlApiRequest } from 'test/integration/graphql/utils/make-graphql-api-request.util';+import { mergeManyOperationFactory } from 'test/integration/graphql/utils/merge-many-operation-factory.util';import { updateOneOperationFactory } from 'test/integration/graphql/utils/update-one-operation-factory.util';import { createOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/create-one-object-metadata.util';import { deleteOneObjectMetadata } from 'test/integration/metadata/suites/object-metadata/utils/delete-one-object-metadata.util';@@ -366,6 +367,59 @@ describe('Records shared beyond the role that can access their object', () => {}});+ it('should refuse a merge that would leave a shared record the role cannot delete', async () => {+ await setMemberObjectAccess(true);+ await upsertRowLevelPermissionPredicates({+ expectToFail: false,+ input: {+ roleId: memberRoleId,+ objectMetadataId,+ predicates: [+ {+ fieldMetadataId: nameFieldMetadataId,+ operand: RowLevelPermissionPredicateOperand.CONTAINS,+ value: 'Visible',+ },+ ],+ predicateGroups: [],+ },+ });++ try {+ await setShare({+ principal: JONY,+ accessLevel: RecordShareAccessLevel.FULL,+ });++ const merged = await makeGraphqlApiRequest(+ mergeManyOperationFactory({+ objectMetadataPluralName: OBJECT_PLURAL,+ gqlFields: 'id',+ ids: [OTHER_RECORD_ID, SHARED_RECORD_ID],+ conflictPriorityIndex: 0,+ }),+ APPLE_JONY_MEMBER_ACCESS_TOKEN,+ );++ expect(merged.body.errors?.[0]?.extensions?.userFriendlyMessage).toBe(+ 'Your role cannot delete some of these records, so they cannot be merged.',+ );+ expect((await findIdsAsJony()).ids.sort()).toEqual(+ [SHARED_RECORD_ID, OTHER_RECORD_ID].sort(),+ );+ } finally {+ await upsertRowLevelPermissionPredicates({+ expectToFail: false,+ input: {+ roleId: memberRoleId,+ objectMetadataId,+ predicates: [],+ predicateGroups: [],+ },+ });+ }+ });+it('should deliver events of the records named for the member only', async () => {const workspaceCacheService =getAppProviderByClassName<WorkspaceCacheService>('WorkspaceCacheService');diff --git a/packages/twenty-shared/src/types/SidePanelPages.ts b/packages/twenty-shared/src/types/SidePanelPages.tsindex ba16c564280..bf0f65f58f5 100644--- a/packages/twenty-shared/src/types/SidePanelPages.ts+++ b/packages/twenty-shared/src/types/SidePanelPages.ts@@ -5,6 +5,7 @@ export enum SidePanelPages {// Deprecated: use AppPath.RecordIndexPage through the routed-page API.ViewRecords = 'view-records',MergeRecords = 'merge-records',+ MergeWithRecord = 'merge-with-record',UpdateRecords = 'update-records',EditRichText = 'edit-rich-text',// Deprecated: use AskAI.